From 35fe93cbc61f379f5dd138d99489d7d54d420ae6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 27 Jan 2015 19:46:51 +0100 Subject: [PATCH] - updated kernel modules build system --- spl.spec | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/spl.spec b/spl.spec index 47cff46..f8ad8c4 100644 --- a/spl.spec +++ b/spl.spec @@ -13,17 +13,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 @@ -31,10 +20,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" ; 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 spl %define rel 4 Summary: Solaris Porting Layer @@ -49,8 +34,8 @@ Source0: http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/%{pname}-%{versi Patch0: linux-3.17.patch Patch1: linux-3.18.patch URL: http://zfsonlinux.org/ -BuildRequires: rpmbuild(macros) >= 1.678 -%{?with_kernel:%{expand:%kbrs}} +BuildRequires: rpmbuild(macros) >= 1.701 +%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -134,7 +119,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} @@ -146,7 +131,7 @@ p=`pwd`\ %{__autoconf} %{__autoheader} %{__automake} -%{?with_kernel:%{expand:%bkpkg}} +%{?with_kernel:%{expand:%build_kernel_packages}} %if %{with userspace} %configure \ -- 2.44.0