[packages/xtables-addons] - switch to macro driven module build for multiple kernel versions - rel 8

baggins baggins at pld-linux.org
Tue Oct 29 19:50:06 CET 2013 

commit 0b25bb4729cb08e89454bd1a7629044549a1f713
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 29 19:49:27 2013 +0100

    - switch to macro driven module build for multiple kernel versions
    - rel 8

 xtables-addons.spec | 142 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 83 insertions(+), 59 deletions(-)
---
diff --git a/xtables-addons.spec b/xtables-addons.spec
index 4483f15..2469253 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -6,25 +6,48 @@
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace tools
+%bcond_with	verbose		# verbose build (V=1)
 
 %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		rel	7
+%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	8
 %define		pname	xtables-addons
 Summary:	Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):	Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
-Name:		%{pname}%{_alt_kernel}
+Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 Version:	2.3
-Release:	%{rel}
+Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	http://downloads.sourceforge.net/xtables-addons/%{pname}-%{version}.tar.xz
@@ -33,69 +56,88 @@ URL:		http://xtables-addons.sourceforge.net/
 BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	iptables-devel >= 1.4.5
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:3.7}
+%{?with_dist_kernel:%{expand:%kbrs}}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 0.9.0
-BuildRequires:	rpmbuild(macros) >= 1.379
+BuildRequires:	rpmbuild(macros) >= 1.678
 BuildRequires:	tar >= 1.22
 BuildRequires:	xz
 Requires:	iptables >= 1.4.5
 Obsoletes:	iptables-ipp2p
 BuildRoot:	%{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
 
-# use macro, so adapter won't try to wrap
-%define		kpackage	kernel%{_alt_kernel}-net-xtables-addons = %{version}-%{rel}@%{_kernel_ver_str}
-
 %description
 xtables-addons is the proclaimed successor to patch-o-matic(-ng). It
 contains extensions that were not accepted in the main
 xtables/iptables package.
 
 For the tools to work, you should install kernel modules, which could
-be found in %{kpackage}.
+be found in kernel*-net-xtables-addons.
 
 %description -l pl.UTF-8
 xtables-addons to następca patch-o-matic(-ng). Zawiera rozszerzenia,
 które nie zostały zaakceptowane do głównego pakietu xtables/iptables.
 
 Aby narzędzia działały należy zainstalować moduły jądra, które można
-znaleźć w pakiecie %{kpackage}.
-
-%package -n kernel%{_alt_kernel}-net-xtables-addons
-Summary:	Kernel modules for xtables addons
-Summary(pl.UTF-8):	Moudły jądra dla rozszerzeń z pakietu xtables-addons
-Release:	%{rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-# VERSION only dependency is intentional, for allowing multiple kernel pkgs and
-# single userspace package installs.
-Requires:	%{pname} = %{version}
-Suggests:	xtables-geoip
-Conflicts:	xtables-geoip < 20090901-2
-%{?with_dist_kernel:%requires_releq_kernel}
-Requires(post,postun):	/sbin/depmod
-
-%description -n kernel%{_alt_kernel}-net-xtables-addons
-Kernel modules for xtables addons.
-
-%description -n kernel%{_alt_kernel}-net-xtables-addons -l pl.UTF-8
-Moduły jądra dla rozszerzeń z pakietu xtables-addons.
+znaleźć w pakiecie kernel*-net-xtables-addons.
+
+%define	kernel_pkg()\
+%package -n kernel%{_alt_kernel}-net-xtables-addons\
+Summary:	Kernel modules for xtables addons\
+Summary(pl.UTF-8):	Moudły jądra dla rozszerzeń z pakietu xtables-addons\
+Release:	%{rel}@%{_kernel_ver_str}\
+Group:		Base/Kernel\
+# VERSION only dependency is intentional, for allowing multiple kernel pkgs and\
+# single userspace package installs.\
+Requires:	%{pname} = %{version}\
+Suggests:	xtables-geoip\
+Conflicts:	xtables-geoip < 20090901-2\
+Requires(post,postun):	/sbin/depmod\
+%if %{with dist_kernel}\
+%requires_releq_kernel\
+Requires(postun):	%releq_kernel\
+%endif\
+\
+%description -n kernel%{_alt_kernel}-net-xtables-addons\
+Kernel modules for xtables addons.\
+\
+%description -n kernel%{_alt_kernel}-net-xtables-addons -l pl.UTF-8\
+Moduły jądra dla rozszerzeń z pakietu xtables-addons.\
+\
+%files -n kernel%{_alt_kernel}-net-xtables-addons\
+%defattr(644,root,root,755)\
+# restricted permissions - may contain password\
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/xt_sysrq.conf\
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/iptable_rawpost.ko*\
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/compat_xtables.ko*\
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_*.ko*\
+\
+%post -n kernel%{_alt_kernel}-net-xtables-addons\
+%depmod %{_kernel_ver}\
+\
+%postun -n kernel%{_alt_kernel}-net-xtables-addons\
+%depmod %{_kernel_ver}\
+%{nil}
+
+%define build_kernel_pkg()\
+srcdir=${PWD:-$(pwd)}\
+%build_kernel_modules XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables\
+%install_kernel_modules -D installed -m extensions/iptable_rawpost -d kernel/net/ipv4/netfilter\
+for drv in extensions/compat_xtables.ko extensions/{ACCOUNT/,pknock/,}xt_*.ko ; do\
+%install_kernel_modules -D installed -m ${drv%.ko} -d kernel/net/netfilter\
+done\
+%{nil}
+
+%{?with_kernel:%{expand:%kpkg}}
 
 %prep
 %setup -q -n %{pname}-%{version}
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
 %configure \
 	--without-kbuild
 
-%if %{with kernel}
-srcdir=${PWD:-$(pwd)}
-%build_kernel_modules V=1 XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables
-%endif
+%{?with_kernel:%{expand:%bkpkg}}
 
 %if %{with userspace}
 %{__make} \
@@ -106,12 +148,10 @@ srcdir=${PWD:-$(pwd)}
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-%install_kernel_modules -m extensions/iptable_rawpost -d kernel/net/ipv4/netfilter
-for drv in extensions/compat_xtables.ko extensions/{ACCOUNT/,pknock/,}xt_*.ko ; do
-%install_kernel_modules -m ${drv%.ko} -d kernel/net/netfilter
-done
-
 install -d $RPM_BUILD_ROOT/etc/modprobe.d
+
+cp -a installed/* $RPM_BUILD_ROOT
+
 cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/xt_sysrq.conf
 # Set password at modprobe time. This file is secure if properly guarded,
 # i.e only readable by root.
@@ -138,12 +178,6 @@ rm -rf $RPM_BUILD_ROOT
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post -n kernel%{_alt_kernel}-net-xtables-addons
-%depmod %{_kernel_ver}
-
-%postun -n kernel%{_alt_kernel}-net-xtables-addons
-%depmod %{_kernel_ver}
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -155,13 +189,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/iptaccount.8*
 %{_mandir}/man8/xtables-addons.8*
 %endif
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-net-xtables-addons
-%defattr(644,root,root,755)
-# restricted permissions - may contain password
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/xt_sysrq.conf
-/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/iptable_rawpost.ko.gz
-/lib/modules/%{_kernel_ver}/kernel/net/netfilter/compat_xtables.ko.gz
-/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_*.ko.gz
-%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xtables-addons.git/commitdiff/0b25bb4729cb08e89454bd1a7629044549a1f713

More information about the pld-cvs-commit mailing list