[projects/template-specs] - switch to macro driven module build for multiple kernel versions

baggins baggins at pld-linux.org
Sun Oct 27 17:13:19 CET 2013


commit 5adcc8ae11397ecde1a0b56cbac542ff8af89c06
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Oct 27 17:12:05 2013 +0100

    - switch to macro driven module build for multiple kernel versions

 kernel-module.spec | 174 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 106 insertions(+), 68 deletions(-)
---
diff --git a/kernel-module.spec b/kernel-module.spec
index 0a6ecb4..97e53e6 100644
--- a/kernel-module.spec
+++ b/kernel-module.spec
@@ -13,14 +13,36 @@
 %if %{without kernel}
 %undefine	with_dist_kernel
 %endif
+
+# The goal here is to have main, userspace, package built once with
+# simple release number, and only rebuild kernel packages with kernel
+# version as part of release number, without the need to bump release
+# with every kernel change.
+%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
+%{error:kernel and userspace cannot be built at the same time on PLD builders}
+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		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		ikpkg	%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define alt_kernel $n ; echo %%install_kernel_pkg ; done)
+
 #
 # main package.
 #
@@ -28,9 +50,9 @@
 %define		pname	PACKAGE_NAME
 Summary:	-
 Summary(pl.UTF-8):	-
-Name:       %{pname}%{_alt_kernel}
+Name:		%{pname}%{_alt_kernel}
 Version:	0.1
-Release:	%{rel}
+Release:	%{rel}%{?with_kernel:@%{_kernel_ver_str}}
 #License:	- (enter GPL/LGPL/BSD/BSD-like/other license name here)
 Group:		Base/Kernel
 Source0:	%{pname}-%{version}.tar.gz
@@ -39,10 +61,8 @@ Source0:	%{pname}-%{version}.tar.gz
 # Source1-md5:	-
 #Patch0:	%{pname}-what.patch
 #URL:		-
-%if %{with kernel}
+BuildRequires:	rpmbuild(macros) >= 1.678
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
-BuildRequires:	rpmbuild(macros) >= 1.379
-%endif
 #BuildRequires:	-
 #Requires(postun):	-
 #Requires(pre,post):	-
@@ -57,28 +77,83 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description -l pl.UTF-8
 
-# kernel subpackages.
-
-%package -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
-Summary:	Linux driver for MODULE_NAME
-Summary(pl.UTF-8):	Sterownik dla Linuksa do MODULE_NAME
-Release:	%{rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun):	%releq_kernel
-%endif
-
-%description -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
-This is driver for MODULE_NAME for Linux.
-
-This package contains Linux module.
-
-%description -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME -l pl.UTF-8
-Sterownik dla Linuksa do MODULE_NAME.
-
-Ten pakiet zawiera moduł jądra Linuksa.
+# kernel subpackages definition.
+
+%define	kernel_pkg()\
+%package -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME\
+Summary:	Linux driver for MODULE_NAME\
+Summary(pl.UTF-8):	Sterownik dla Linuksa do MODULE_NAME\
+Release:	%{rel}@%{_kernel_ver_str}\
+Group:		Base/Kernel\
+Requires(post,postun):	/sbin/depmod\
+%if %{with dist_kernel}\
+%requires_releq_kernel\
+Requires(postun):	%releq_kernel\
+%endif\
+\
+%description -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME\
+This is driver for MODULE_NAME for Linux.\
+\
+This package contains Linux module.\
+\
+%description -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME -l pl.UTF-8\
+Sterownik dla Linuksa do MODULE_NAME.\
+\
+Ten pakiet zawiera moduł jądra Linuksa.\
+\
+%if %{with kernel}\
+%files -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME\
+%defattr(644,root,root,755)\
+/lib/modules/%{_kernel_ver}/kernel/MODULE_DIR/*.ko*\
+%endif\
+\
+%post	-n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME\
+%depmod %{_kernel_ver}\
+\
+%postun	-n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME\
+%depmod %{_kernel_ver}\
+%{nil}
+
+%define build_kernel_pkg()\
+%build_kernel_modules -m MODULE_NAME\
+\
+# modules placed in subdirectory:\
+%build_kernel_modules -C path/to/dir -m MODULE_NAME,MODULE2\
+\
+# need to pass additional options to make modules:\
+%build_kernel_modules VAR1=value1 VAR2=value2 -m MODULE_NAME\
+\
+# optional patching:\
+%build_kernel_modules -m MODULE_NAME <<'EOF'\
+# Your script here:\
+if grep -q "CONFIG_SOME_OPTION" o/.config; then\
+	sed 's/some/change/' file.c.orig > file.c\
+else\
+	cat file.c.orig > file.c\
+fi\
+# Don't do it this way unless it depends on kernel options or something\
+# you can't check before\
+EOF\
+\
+# install to local directory, this makes building for multiple kernels easy\
+%install_kernel_modules -D installed -m MODULE_NAME -d kernel/MODULE_DIR\
+\
+# to avoid conflict with in-kernel modules, and prepare modprobe config:\
+%install_kernel_modules -D installed -s current -n NAME -m MODULE_NAME -d kernel/MODULE_DIR\
+%{nil}
+
+%define install_kernel_pkg()\
+# any additional, per-module, tasks needed at install,\
+# like blacklisting in-kernel module to always load this one\
+install -d $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}\
+# blacklist kernel module\
+cat > $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/MODULE_NAME.conf <<'EOF'\
+blacklist MODULE_NAME\
+alias MODULE_NAME MODULE_NAME-current\
+EOF\
+%{nil}
+
+%{?with_kernel:%{expand:%kpkg}}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -100,64 +175,27 @@ EOF
 %build
 %if %{with userspace}
 
-
 %endif
 
-%if %{with kernel}
-%build_kernel_modules -m MODULE_NAME
-
-# modules placed in subdirectory:
-%build_kernel_modules -C path/to/dir -m MODULE_NAME,MODULE2
-
-# need to pass additional options to make modules:
-%build_kernel_modules VAR1=value1 VAR2=value2 -m MODULE_NAME
-
-# optional patching:
-%build_kernel_modules -m MODULE_NAME <<'EOF'
-# Your script here:
-if grep -q "CONFIG_SOME_OPTION" o/.config; then
-	sed 's/some/change/' file.c.orig > file.c
-else
-	cat file.c.orig > file.c
-fi
-# Don't do it this way unless it depends on kernel options or something
-# you can't check before
-EOF
-
-%endif
+%{?with_kernel:%{expand:%bkpkg}}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT
 
 %if %{with userspace}
 
-
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m MODULE_NAME -d kernel/MODULE_DIR
-
-# to avoid conflict with in-kernel modules, and prepare modprobe config:
-%install_kernel_modules -s current -n NAME -m MODULE_NAME -d kernel/MODULE_DIR
+%{expand:%ikpkg}
+cp -a installed/* $RPM_BUILD_ROOT
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
-%depmod %{_kernel_ver}
-
-%postun	-n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
-%depmod %{_kernel_ver}
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/MODULE_DIR/*.ko*
-%endif
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/5adcc8ae11397ecde1a0b56cbac542ff8af89c06



More information about the pld-cvs-commit mailing list