- switch to macro driven module build for multiple kernel versions

- rel 12

diff --git a/linux-fusion.spec b/linux-fusion.spec
index 0fb89233ac9081acd21dc9aa97183662cc5558de..a56312d17f55966598107f1a7d304cf99a49e9be 100644 (file)
--- a/linux-fusion.spec
+++ b/linux-fusion.spec
@@ -4,21 +4,46 @@
 %bcond_without kernel          # don't build kernel modules
 %bcond_without userspace       # don't build userspace programs
 %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     11
+%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     12
 %define                pname   linux-fusion
 Summary:       Fusion and One Linux kernel modules
 Summary(pl.UTF-8):     Moduły Fusion i One dla jądra Linuksa
 Name:          %{pname}%{_alt_kernel}
 Version:       9.0.2
-Release:       %{rel}
+Release:       %{rel}%{?with_kernel:@%{_kernel_ver_str}}
 License:       GPL v2+
 Group:         Base/Kernel
 Source0:       http://www.directfb.org/downloads/Core/linux-fusion/%{pname}-%{version}.tar.gz
@@ -26,7 +51,7 @@ Source0:      http://www.directfb.org/downloads/Core/linux-fusion/%{pname}-%{version}
 URL:           http://www.directfb.org/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 3:2.6.20.2}
-BuildRequires: rpmbuild(macros) >= 1.379
+BuildRequires: rpmbuild(macros) >= 1.678
 %endif
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -65,43 +90,79 @@ Plik nagłówkowy dla urządzenia IPC One.
 
 Linux One to nowe API IPC wykorzystywane przez Comę.
 
-%package -n kernel%{_alt_kernel}-char-fusion
-Summary:       Fusion module for Linux kernel
-Summary(pl.UTF-8):     Moduł Fusion dla jądra Linuksa
-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}-char-fusion
-Fusion module for Linux kernel.
-
-%description -n kernel%{_alt_kernel}-char-fusion -l pl.UTF-8
-Moduł Fusion dla jądra Linuksa.
-
-%package -n kernel%{_alt_kernel}-misc-one
-Summary:       One IPC module for Linux kernel
-Summary(pl.UTF-8):     Moduł IPC One dla jądra Linuksa
-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}-misc-one
-One IPC module for Linux kernel.
-
-Linux One is the new IPC API used by Coma.
-
-%description -n kernel%{_alt_kernel}-misc-one -l pl.UTF-8
-Moduł IPC One dla jądra Linuksa.
-
-Linux One to nowe API IPC wykorzystywane przez Comę.
+%define        kernel_pkg()\
+%package -n kernel%{_alt_kernel}-char-fusion\
+Summary:       Fusion module for Linux kernel\
+Summary(pl.UTF-8):     Moduł Fusion dla jądra Linuksa\
+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}-char-fusion\
+Fusion module for Linux kernel.\
+\
+%description -n kernel%{_alt_kernel}-char-fusion -l pl.UTF-8\
+Moduł Fusion dla jądra Linuksa.\
+\
+%post  -n kernel%{_alt_kernel}-char-fusion\
+%depmod %{_kernel_ver}\
+\
+%postun        -n kernel%{_alt_kernel}-char-fusion\
+%depmod %{_kernel_ver}\
+\
+%if %{with kernel}\
+%files -n kernel%{_alt_kernel}-char-fusion\
+%defattr(644,root,root,755)\
+/lib/modules/%{_kernel_ver}/kernel/drivers/char/fusion.ko*\
+%endif\
+\
+%package -n kernel%{_alt_kernel}-misc-one\
+Summary:       One IPC module for Linux kernel\
+Summary(pl.UTF-8):     Moduł IPC One dla jądra Linuksa\
+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}-misc-one\
+One IPC module for Linux kernel.\
+\
+Linux One is the new IPC API used by Coma.\
+\
+%description -n kernel%{_alt_kernel}-misc-one -l pl.UTF-8\
+Moduł IPC One dla jądra Linuksa.\
+\
+Linux One to nowe API IPC wykorzystywane przez Comę.\
+\
+%post  -n kernel%{_alt_kernel}-misc-one\
+%depmod %{_kernel_ver}\
+\
+%postun        -n kernel%{_alt_kernel}-misc-one\
+%depmod %{_kernel_ver}\
+\
+%if %{with kernel}\
+%files -n kernel%{_alt_kernel}-misc-one\
+%defattr(644,root,root,755)\
+/lib/modules/%{_kernel_ver}/misc/linux-one.ko*\
+%endif\
+%{nil}
+
+%define build_kernel_pkg()\
+# NOTE: build_kernel_modules (as of rpm macros 1.649) doesn't allow line breaking\
+%build_kernel_modules -C linux/drivers/char/fusion -m fusion FUSIONCORE=single\
+%build_kernel_modules -C one -m linux-one ONECORE=single\
+%install_kernel_modules -D installed -m linux/drivers/char/fusion/fusion -d kernel/drivers/char\
+%install_kernel_modules -D installed -m  one/linux-one -d misc\
+%{nil}
+
+%{?with_kernel:%{expand:%kpkg}}
 
 %prep
 %setup -q -n %{pname}-%{version}
@@ -111,19 +172,15 @@ Linux One to nowe API IPC wykorzystywane przez Comę.
 echo "EXTRA_CFLAGS = -I`pwd`/linux/include -I`pwd`/linux/drivers/char/fusion -I`pwd`/linux/drivers/char/fusion/single" >> linux/drivers/char/fusion/Makefile-2.6
 echo "EXTRA_CFLAGS = -I`pwd`/include -I`pwd`/one/single" >> one/Makefile-2.6
 
+ln -sf Makefile-2.6 linux/drivers/char/fusion/Makefile
+ln -sf Makefile-2.6 one/Makefile
+
 %build
-%if %{with kernel}
-cd linux/drivers/char/fusion
-ln -sf Makefile-2.6 Makefile
-# NOTE: build_kernel_modules (as of rpm macros 1.649) doesn't allow line breaking
-%build_kernel_modules -m fusion FUSIONCORE=single
-cd ../../../../one
-ln -sf Makefile-2.6 Makefile
-%build_kernel_modules -m linux-one ONECORE=single
-%endif
+%{?with_kernel:%{expand:%bkpkg}}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_includedir}/linux
@@ -132,27 +189,12 @@ install include/linux/one.h $RPM_BUILD_ROOT%{_includedir}/linux
 %endif
 
 %if %{with kernel}
-cd linux/drivers/char/fusion
-%install_kernel_modules -m fusion -d kernel/drivers/char
-cd ../../../../one
-%install_kernel_modules -m linux-one -d misc
+cp -a installed/* $RPM_BUILD_ROOT
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -n kernel%{_alt_kernel}-char-fusion
-%depmod %{_kernel_ver}
-
-%postun        -n kernel%{_alt_kernel}-char-fusion
-%depmod %{_kernel_ver}
-
-%post  -n kernel%{_alt_kernel}-misc-one
-%depmod %{_kernel_ver}
-
-%postun        -n kernel%{_alt_kernel}-misc-one
-%depmod %{_kernel_ver}
-
 %if %{with userspace}
 %files devel
 %defattr(644,root,root,755)
@@ -164,13 +206,3 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.linux-one TODO.linux-one
 %{_includedir}/linux/one.h
 %endif
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-char-fusion
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/drivers/char/fusion.ko*
-
-%files -n kernel%{_alt_kernel}-misc-one
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/linux-one.ko*
-%endif