SPECS: aufs.spec - up to 20080527; fixes.patch and spin_lock.patch added, d...

[zbyniu]

Author: zbyniu                       Date: Tue May 27 08:20:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 20080527; fixes.patch and spin_lock.patch added, disable-security_inode_permission.patch restored

---- Files affected:
SPECS:
   aufs.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/aufs.spec
diff -u SPECS/aufs.spec:1.24 SPECS/aufs.spec:1.25
--- SPECS/aufs.spec:1.24	Sat May 17 22:54:49 2008
+++ SPECS/aufs.spec	Tue May 27 10:20:27 2008
@@ -1,5 +1,8 @@
 # $Revision$, $Date$
 #
+# TODO:
+# - define CONFIG_ option directly
+#
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
@@ -10,7 +13,7 @@
 %undefine	with_dist_kernel
 %endif
 
-%define		subver		20080517
+%define		subver		20080527
 %define		prel		0.%{subver}.%{rel}
 
 %define		rel		1
@@ -24,6 +27,9 @@
 Source0:	%{name}-%{subver}.tar.bz2
 # Source0-md5:	61a932836cdb0f34e9aed6a6a6697547
 Patch0:		%{name}-vserver.patch
+Patch1:		%{name}-disable-security_inode_permission.patch
+Patch2:		%{name}-fixes.patch
+Patch3:		%{name}-spin_lock.patch
 URL:		http://aufs.sourceforge.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.25.2}
@@ -74,6 +80,9 @@
 %prep
 %setup -qn %{name}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 sed '
 	s/$(CONFIG_AUFS)/m/; 
@@ -82,15 +91,16 @@
 	s/$(CONFIG_AUFS_EXPORT)/y/;
 	s/$(CONFIG_AUFS_SYSAUFS)/n/
 ' -i fs/aufs/Makefile
-cp -a include/linux fs/aufs
+cp -a include/linux fs/aufs25
 
 %build
 %if %{with kernel}
 if [ -f %{_kernelsrcdir}/include/linux/vs_base.h ]; then
 	isvserver="-DVSERVER"
 fi
-%build_kernel_modules -C fs/aufs -m aufs \
-	EXTRA_CFLAGS=" \
+export CONFIG_AUFS_BR_XFS=y
+%build_kernel_modules -C fs/aufs25 -m aufs \
+	EXTRA_CFLAGS+=" \
 		-DCONFIG_AUFS_BRANCH_MAX_127 \
 		-DCONFIG_AUFS_BRANCH_MAX_CHAR \
 		-DCONFIG_AUFS_FAKE_DM \
@@ -117,7 +127,7 @@
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m fs/aufs/aufs -d kernel/fs/aufs
+%install_kernel_modules -m fs/aufs25/aufs -d kernel/fs/aufs
 %endif
 
 %clean
@@ -150,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2008-05-27 08:20:27  zbyniu
+- up to 20080527; fixes.patch and spin_lock.patch added, disable-security_inode_permission.patch restored
+
 Revision 1.24  2008-05-17 20:54:49  areq
 - 20080517
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/aufs.spec?r1=1.24&r2=1.25&f=u