commit 1406b2a007d0eb8c8202527eaed82440264633fc
Author: Jan Rękorajski <[email protected]>
Date: Tue Jan 27 20:20:16 2015 +0100
- updated kernel modules build system
madwifi-ng.spec | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/madwifi-ng.spec b/madwifi-ng.spec
index 761bb98..149aa0b 100644
--- a/madwifi-ng.spec
+++ b/madwifi-ng.spec
@@ -17,26 +17,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 snap_year 2012
%define snap_month 01
%define snap_day 31
@@ -72,8 +57,8 @@ Patch2: %{pname}-ticket-617.patch
Patch3: %{pname}-ieee80211-skb-update.patch
Patch4: format-security.patch
URL: http://madwifi-project.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}}
Provides: madwifi
Obsoletes: madwifi
ExclusiveArch: alpha arm %{ix86} %{x8664} mips powerpc ppc sparc sparcv9
sparc64 xscale
@@ -144,7 +129,7 @@ Ten pakiet zawiera moduł jądra Linuksa.\
%install_kernel_modules -D installed -m %{modules_ath},%{modules_wlan} -d
kernel/net\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{tname}-%{trunk}-%{snap}
@@ -174,7 +159,7 @@ Ten pakiet zawiera moduł jądra Linuksa.\
%define target powerpc-be-elf
%endif
-%{?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/madwifi-ng.git/commitdiff/d6051d41a311127a29f765cc4a536564842e9305
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
