%undefine with_dist_kernel
%endif
-%define subver 20080527
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine with_userspace
+%endif
+
+%define subver 20081106
%define prel 0.%{subver}.%{rel}
-%define rel 10
+%define pname aufs
+%define rel 1
Summary: aufs - Another Unionfs
Summary(pl.UTF-8): aufs (Another Unionfs) - inny unionfs
-Name: aufs
+Name: %{pname}%{_alt_kernel}
Version: 0
Release: %{prel}
License: GPL v2
Group: Base/Kernel
-Source0: %{name}-%{subver}.tar.bz2
-# Source0-md5: aeb6880930a8abcb60947e96b310d3df
-Patch0: %{name}-vserver.patch
-Patch1: %{name}-disable-security_inode_permission.patch
-Patch2: %{name}-fixes.patch
-Patch3: %{name}-spin_lock.patch
+Source0: %{pname}-%{subver}.tar.bz2
+# Source0-md5: 9a0d8cdeae8706d51f7912b42f7dd438
+Patch0: %{pname}-vserver.patch
+#Patch1: %{pname}-disable-security_inode_permission.patch
+Patch2: %{pname}-fixes.patch
+#Patch3: %{pname}-spin_lock.patch
+Patch4: %{pname}-apparmor.patch
URL: http://aufs.sourceforge.net/
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.25.2}
Ten pakiet zawiera moduł jądra Linuksa.
%prep
-%setup -qn %{name}
+%setup -qn %{pname}
%patch0 -p1
-%patch1 -p1
+#%patch1 -p1
%patch2 -p1
-%patch3 -p1
-
-# we should make it better
-sed '
- s/$(CONFIG_AUFS)/m/;
- %{!?debug:s/$(CONFIG_AUFS_DEBUG.*)/n/};
- s/$(CONFIG_AUFS_HINOTIFY)/n/;
- s/$(CONFIG_AUFS_EXPORT)/y/;
- s/$(CONFIG_AUFS_SYSAUFS)/n/
-' -i fs/aufs/Makefile
+#%patch3 -p1
+if [ -d %{_kernelsrcdir}/security/apparmor ]; then
+%patch4 -p1
+fi
+
cp -a include/linux fs/aufs25
%build
%if %{with kernel}
-if [ -f %{_kernelsrcdir}/include/linux/vs_base.h ]; then
+if [ -f %{_kernelsrcdir}/include/linux/vs_base.h &&
+ ! -d %{_kernelsrcdir}/security/apparmor ]; then
isvserver="-DVSERVER"
fi
+%ifarch %{x8664} ia64 ppc64 sparc64
+ ino_t64="-DCONFIG_AUFS_INO_T_64"
+%endif
+
export CONFIG_AUFS=m
export CONFIG_AUFS_BR_XFS=y
%build_kernel_modules -C fs/aufs25 -m aufs \
-DCONFIG_AUFS_MODULE \
-UCONFIG_AUFS_KSIZE_PATCH \
-UCONFIG_AUFS_DLGT \
+%if "%{_alt_kernel}" != "vanilla"
+ -DCONFIG_AUFS_UNIONFS23_PATCH \
+ -DCONFIG_AUFS_UNIONFS22_PATCH \
+ -DCONFIG_AUFS_SPLICE_PATCH \
+%endif
%{?debug:-DCONFIG_AUFS_DEBUG} \
- $isvserver"
+ $isvserver \
+ $ino_t64"
%endif
%if %{with userspace}