[packages/wl] - updated kernel modules build system
baggins
baggins at pld-linux.org
Tue Jan 27 19:56:52 CET 2015
commit 87d5fa42f66ac5daca5ae888d81249f6b8512b32
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Jan 27 19:56:22 2015 +0100
- updated kernel modules build system
wl.spec | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
---
diff --git a/wl.spec b/wl.spec
index a3221e2..ab201b8 100644
--- a/wl.spec
+++ b/wl.spec
@@ -3,23 +3,9 @@
%bcond_with verbose # verbose build (V=1)
%bcond_with dkms # build dkms package
-%if "%{_alt_kernel}" != "%{nil}"
-%if 0%{?build_kernels:1}
-%{error:alt_kernel and build_kernels are mutually exclusive}
-exit 1
-%endif
-%global _build_kernels %{alt_kernel}
-%else
-%global _build_kernels %{?build_kernels:,%{?build_kernels}}
-%endif
-
# nothing to be placed to debuginfo package
%define _enable_debug_packages 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 rel 3
%define pname wl
%define file_ver %(echo %{version} | tr . _)
@@ -39,8 +25,8 @@ Source3: dkms.conf
Patch0: linux-3.17.patch
Patch1: gcc-4.9.patch
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-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}}
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -107,7 +93,7 @@ EOF\
%install_kernel_modules -D installed -m wl -d kernel/drivers/net/wireless\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%ifarch %{x8664}
@@ -140,7 +126,7 @@ EXTRA_LDFLAGS := $(KBUILD_EXTMOD)/lib/wlc_hybrid.o_shipped
EOF
%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/wl.git/commitdiff/747711c2b9fe1437fd46f23a57fa0d0bdf8943f7
More information about the pld-cvs-commit
mailing list