[packages/linux-fusion] - updated kernel modules build system

baggins baggins at pld-linux.org
Tue Jan 27 19:34:22 CET 2015


commit c90e5af280c7446ae4b49c914ddd4d6632c11604
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jan 27 19:33:57 2015 +0100

    - updated kernel modules build system

 linux-fusion.spec | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/linux-fusion.spec b/linux-fusion.spec
index fbed2f7..ca944e4 100644
--- a/linux-fusion.spec
+++ b/linux-fusion.spec
@@ -13,26 +13,11 @@
 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
 %endif
 
-%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		rel	1
 %define		pname	linux-fusion
 Summary:	Fusion and One Linux kernel modules
@@ -45,8 +30,8 @@ Group:		Base/Kernel
 Source0:	http://www.directfb.org/downloads/Core/linux-fusion/%{pname}-%{version}.tar.xz
 # Source0-md5:	5799f52ec656cdd3da592c94a6262199
 URL:		http://www.directfb.org/
-%{?with_kernel:%{expand:%kbrs}}
-BuildRequires:	rpmbuild(macros) >= 1.678
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
+BuildRequires:	rpmbuild(macros) >= 1.701
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -154,7 +139,7 @@ Linux One to nowe API IPC wykorzystywane przez Comę.\
 %install_kernel_modules -D installed -m  one/linux-one -d misc\
 %{nil}
 
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -168,7 +153,7 @@ ln -sf Makefile-2.6 linux/drivers/char/fusion/Makefile
 ln -sf Makefile-2.6 one/Makefile
 
 %build
-%{?with_kernel:%{expand:%bkpkg}}
+%{?with_kernel:%{expand:%build_kernel_packages}}
 
 %install
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-fusion.git/commitdiff/bddc560999d18a1038b78d9799a0fb1c0fd6377b



More information about the pld-cvs-commit mailing list