commit 2d67b9de821995c174566fe0397501e23ca02d14
Author: Jan Rękorajski <[email protected]>
Date: Tue Jan 27 20:11:59 2015 +0100
- updated kernel modules build system
zfs.spec | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
---
diff --git a/zfs.spec b/zfs.spec
index a90980c..9f01db0 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -14,17 +14,6 @@
exit 1
%endif
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%undefine with_userspace
-%global _build_kernels %{alt_kernel}
-%else
-%global _build_kernels
%{?build_kernels:,%{?build_kernels}}
-%endif
-
%if %{without userspace}
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
@@ -32,10 +21,6 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define kbrs %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define
alt_kernel $n ; echo "BuildRequires:kernel%%{_alt_kernel}-module-build >=
3:2.6.20.2,kernel%%{_alt_kernel}-spl-devel >= 0.6.3" ; done)
-%define kpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
-%define bkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
-
%define pname zfs
%define rel 4
Summary: Native Linux port of the ZFS filesystem
@@ -54,7 +39,10 @@ BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: libtool
BuildRequires: rpmbuild(macros) >= 1.701
-%{?with_kernel:%{expand:%kbrs}}
+%if %{with kernel}
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >=
3:2.6.20.2}
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-spl-devel >= 0.6.3}
+%endif
%if %{with userspace}
BuildRequires: libblkid-devel
BuildRequires: libselinux-devel
@@ -219,7 +207,7 @@ p=`pwd`\
%{__make} install DESTDIR=$p/installed INSTALL_MOD_DIR=misc\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -232,7 +220,7 @@ p=`pwd`\
%{__autoconf}
%{__autoheader}
%{__automake}
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
%if %{with userspace}
%configure \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/b6c66a4f17c3e8b6188d53ca175de43b103be4fd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
