SPECS (LINUX_2_6_22): kernel.spec - added linux-2.6.22-inotify-fix.patch (f...

[charles]

Author: charles                      Date: Tue Jun 24 12:33:33 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- added linux-2.6.22-inotify-fix.patch (from 2.6.25)
- fix build without grsecurity, fix generate initrd
- sync KABI

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.84 -> 1.441.2.1796.2.85) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.84 SPECS/kernel.spec:1.441.2.1796.2.85
--- SPECS/kernel.spec:1.441.2.1796.2.84	Mon Jun 23 22:04:26 2008
+++ SPECS/kernel.spec	Tue Jun 24 14:33:27 2008
@@ -123,7 +123,7 @@
 
 # Our Kernel ABI, increase this when you want the out of source modules being rebuilt
 # Usually same as %{_rel}
-%define		KABI		6
+%define		KABI		8
 
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -383,6 +383,7 @@
 
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	linux-2.6.21.1-pwc-uncompress.patch
+Patch2002:	linux-2.6.22-inotify-fix.patch
 
 # kill some thousands of warnings
 Patch2500:	linux-2.6-warnings.patch
@@ -997,6 +998,7 @@
 # Small fixes:
 %patch2000 -p1
 %patch2001 -p1
+%patch2002 -p1
 
 %if %{with abi}
 %patch6000 -p1
@@ -1178,6 +1180,8 @@
 %else
 %if %{with grsec_minimal}
 	cat %{SOURCE51} >> arch/%{_target_base_arch}/defconfig
+%else
+	echo "CONFIG_PROC_KCORE=y" >> arch/%{_target_base_arch}/defconfig
 %endif
 %endif
 
@@ -1446,8 +1450,8 @@
 
 %depmod %{kernel_release}
 
-/sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
-mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null}
+/sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
+mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
 %{?alt_kernel:mv -f %{initrd_dir}/initrd-%{alt_kernel}{,.old} 2> /dev/null}
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd
 %{?alt_kernel:ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}}
@@ -1729,6 +1733,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.85  2008/06/24 12:33:27  charles
+- added linux-2.6.22-inotify-fix.patch (from 2.6.25)
+- fix build without grsecurity, fix generate initrd
+- sync KABI
+
 Revision 1.441.2.1796.2.84  2008/06/23 20:04:26  arekm
 - revert; that was meant for 2.6.25
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.84&r2=1.441.2.1796.2.85&f=u