SPECS (LINUX_2_6): kernel.spec - added patch for apparmor vfs changes in un...

[zbyniu]

Author: zbyniu                       Date: Mon Nov  3 01:17:27 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- added patch for apparmor vfs changes in unionfs

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1994 -> 1.441.2.1995) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1994 SPECS/kernel.spec:1.441.2.1995
--- SPECS/kernel.spec:1.441.2.1994	Sat Nov  1 14:02:58 2008
+++ SPECS/kernel.spec	Mon Nov  3 02:17:20 2008
@@ -280,8 +280,9 @@
 # Fix verified for that kernel version.
 Patch130:	linux-2.6-forcedeth-WON.patch
 
-# http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.4_for_2.6.26.diff.gz
+# http://download.filesystems.org/unionfs/unionfs-2.x/unionfs-2.5_for_2.6.27-rc6.diff.gz
 Patch140:	kernel-unionfs.patch
+Patch141:	kernel-unionfs-apparmor.patch
 
 Patch200:	linux-2.6-ppc-ICE-hacks.patch
 
@@ -332,7 +333,7 @@
 %ifarch sparc sparc64
 BuildRequires:	elftoaout
 %endif
-%ifarch ppc
+%if "%{_arch}" == ppc
 BuildRequires:	uboot-mkimage
 %endif
 BuildRequires:	/sbin/depmod
@@ -833,6 +834,7 @@
 
 # unionfs
 %patch140 -p1
+%patch141 -p1
 
 %patch2500 -p1
 
@@ -1021,8 +1023,6 @@
 		CONFIG_SECURITY_APPARMOR=y
 		CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 		CONFIG_SECURITY_APPARMOR_DISABLE=n
-		# patch for unionfs not ready yet
-		CONFIG_UNION_FS=n
 %endif
 
 %if %{without ipv6}
@@ -1639,6 +1639,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1995  2008/11/03 01:17:20  zbyniu
+- added patch for apparmor vfs changes in unionfs
+
 Revision 1.441.2.1994  2008/11/01 13:02:58  arekm
 - builds with smack enabled; unionfs still problematic
 
================================================================

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