[packages/dahdi-linux] - updated kernl modules build system
baggins
baggins at pld-linux.org
Tue Jan 27 19:17:51 CET 2015
commit 453aa04e967758675671b8e93c4c92de48ee8ea8
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Jan 27 19:16:57 2015 +0100
- updated kernl modules build system
dahdi-linux.spec | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 0b3f534..d589480 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -30,26 +30,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 2
%define pname dahdi-linux
%define FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases
@@ -75,7 +60,7 @@ Source7: %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
Patch0: linux-3.18.patch
URL: http://www.asterisk.org/
BuildRequires: rpmbuild(macros) >= 1.678
-%{?with_kernel:%{expand:%kbrs}}
+%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.379
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -169,7 +154,7 @@ cd ../..\
%endif\
%{nil}
-%{?with_kernel:%{expand:%kpkg}}
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
%setup -q -n %{pname}-%{version}
@@ -190,7 +175,7 @@ chmod a+rx download-logger
%build
%{__make} include/dahdi/version.h
-%{?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/dahdi-linux.git/commitdiff/fcd3b77f2ee888bc6838800f093860cd572f2a81
More information about the pld-cvs-commit
mailing list