SPECS: unionfs.spec - %{_alt_kernel} support - use %build_kernel_m...
sparky
sparky at pld-linux.org
Mon Nov 13 21:03:43 CET 2006
Author: sparky Date: Mon Nov 13 20:03:43 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- %{_alt_kernel} support
- use %build_kernel_modules, %install_kernel_modules macros
---- Files affected:
SPECS:
unionfs.spec (1.23 -> 1.24)
---- Diffs:
================================================================
Index: SPECS/unionfs.spec
diff -u SPECS/unionfs.spec:1.23 SPECS/unionfs.spec:1.24
--- SPECS/unionfs.spec:1.23 Mon Nov 13 16:04:12 2006
+++ SPECS/unionfs.spec Mon Nov 13 21:03:37 2006
@@ -32,11 +32,11 @@
Source0: ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/%{name}-%{version}.tar.gz
# Source0-md5: 2a8c6ef320efc43af91074ab47046f09
Patch0: %{name}-build.patch
-Patch1: %{name}-vserver.patch
+#Patch1: %{name}-vserver.patch
URL: http://www.filesystems.org/project-unionfs.html
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build = 3:2.6.16}
-BuildRequires: rpmbuild(macros) >= 1.217
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build = 3:2.6.16}
+BuildRequires: rpmbuild(macros) >= 1.326
%endif
BuildRequires: libuuid-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,7 +60,7 @@
odczytu i zapisu, a także wstawianie i usuwanie gałęzi w dowolnym
miejscu.
-%package -n kernel-fs-unionfs
+%package -n kernel%{_alt_kernel}-fs-unionfs
Summary: Linux driver for unionfs
Summary(pl): Sterownik Linuksa dla unionfs
Release: %{_rel}@%{_kernel_ver_str}
@@ -71,13 +71,13 @@
Requires(postun): %releq_kernel_up
%endif
-%description -n kernel-fs-unionfs
+%description -n kernel%{_alt_kernel}-fs-unionfs
Linux driver for unionfs.
-%description -n kernel-fs-unionfs -l pl
+%description -n kernel%{_alt_kernel}-fs-unionfs -l pl
Sterownik Linuksa dla unionfs.
-%package -n kernel-smp-fs-unionfs
+%package -n kernel%{_alt_kernel}-smp-fs-unionfs
Summary: Linux SMP driver for unionfs
Summary(pl): Sterownik Linuksa SMP dla unionfs
Release: %{_rel}@%{_kernel_ver_str}
@@ -86,52 +86,23 @@
%requires_releq_kernel_smp
Requires(postun): %releq_kernel_smp
%endif
-Provides: kernel-unionfs = %{version}-%{_rel}@%{_kernel_ver_str}
+Provides: kernel%{_alt_kernel}-unionfs = %{version}-%{_rel}@%{_kernel_ver_str}
-%description -n kernel-smp-fs-unionfs
+%description -n kernel%{_alt_kernel}-smp-fs-unionfs
Linux SMP driver unionfs.
-%description -n kernel-smp-fs-unionfs -l pl
+%description -n kernel%{_alt_kernel}-smp-fs-unionfs -l pl
Sterownik Linuksa SMP dla unionfs.
%prep
%setup -q %{?_snap:-n %{name}-%{_snap}}
%patch0 -p1
-%{?with_vserver:%patch1 -p1}
+#%{?with_vserver:%patch1 -p1}
%build
%if %{with kernel}
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
- if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
- exit 1
- fi
- install -d o/include/linux
- ln -sf %{_kernelsrcdir}/config-$cfg o/.config
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-%if %{with dist_kernel}
- %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
- install -d o/include/config
- touch o/include/config/MARKER
- ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
- CC="%{__cc}" CPP="%{__cpp}" \
- EXTRACFLAGS="-DUNIONFS_NDEBUG -DUNIONFS_XATTR" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD/o \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- mv unionfs{,-$cfg}.ko
-done
+%build_kernel_modules -m unionfs \
+ EXTRA_CFLAGS="-DUNIONFS_NDEBUG -DUNIONFS_XATTR"
%endif
%if %{with userspace}
@@ -144,13 +115,7 @@
rm -rf $RPM_BUILD_ROOT
%if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs
-install unionfs-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/unionfs.ko
-%if %{with smp} && %{with dist_kernel}
-install unionfs-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/unionfs.ko
-%endif
+%install_kernel_modules -m unionfs -d kernel/fs
%endif
%if %{with userspace}
@@ -162,16 +127,16 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -n kernel-fs-unionfs
+%post -n kernel%{_alt_kernel}-fs-unionfs
%depmod %{_kernel_ver}
-%postun -n kernel-fs-unionfs
+%postun -n kernel%{_alt_kernel}-fs-unionfs
%depmod %{_kernel_ver}
-%post -n kernel-smp-fs-unionfs
+%post -n kernel%{_alt_kernel}-smp-fs-unionfs
%depmod %{_kernel_ver}smp
-%postun -n kernel-smp-fs-unionfs
+%postun -n kernel%{_alt_kernel}-smp-fs-unionfs
%depmod %{_kernel_ver}smp
%if %{with userspace}
@@ -183,12 +148,12 @@
%endif
%if %{with kernel}
-%files -n kernel-fs-unionfs
+%files -n kernel%{_alt_kernel}-fs-unionfs
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/kernel/fs/*.ko*
%if %{with smp} && %{with dist_kernel}
-%files -n kernel-smp-fs-unionfs
+%files -n kernel%{_alt_kernel}-smp-fs-unionfs
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/kernel/fs/*.ko*
%endif
@@ -200,6 +165,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.24 2006/11/13 20:03:37 sparky
+- %{_alt_kernel} support
+- use %build_kernel_modules, %install_kernel_modules macros
+
Revision 1.23 2006/11/13 15:04:12 sparky
- don't use %{without ...}, it may not work after inverting bcond
@@ -258,7 +227,7 @@
Revision 1.5 2005/07/28 20:08:41 pluto
- complaint with template-kernel-module.
-- build utils in %%build.
+- build utils in %build.
- kernel modules renamed to kernel-{,smp-}fs-unionfs.
- release 1.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/unionfs.spec?r1=1.23&r2=1.24&f=u
More information about the pld-cvs-commit
mailing list