[packages/kernel] add firmware bcond to disable packaging firmware in main package (use linux-firmware package)

glen glen at pld-linux.org
Fri Feb 13 10:40:49 CET 2015


commit 6133b03ba349175a5dd4e5aaacea9a73c2a95115
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Feb 3 00:03:10 2015 +0200

    add firmware bcond to disable packaging firmware in main package (use linux-firmware package)

 kernel.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index d118708..b70c0d3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -18,6 +18,7 @@
 %bcond_without	source		# don't build kernel-source package
 %bcond_without	doc			# don't build kernel-doc package
 %bcond_without	pcmcia		# don't build pcmcia
+%bcond_without	firmware	# don't build firmware into main package
 
 %bcond_with	verbose		# verbose build (V=1)
 
@@ -952,7 +953,7 @@ cd -
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} modules_install firmware_install \
+%{__make} %{MakeOpts} -j1 %{!?with_verbose:-s} modules_install %{?with_firmware:firmware_install} \
 	-C %{objdir} \
 	%{?with_verbose:V=1} \
 	DEPMOD=%{DepMod} \
@@ -1248,7 +1249,9 @@ fi
 /boot/config-%{kernel_release}
 %ghost %{initrd_dir}/initrd-%{kernel_release}.gz
 %ghost %{initrd_dir}/initramfs-%{kernel_release}.img
+%if %{with firmware}
 /lib/firmware/%{kernel_release}
+%endif
 
 %dir /lib/modules/%{kernel_release}
 %dir /lib/modules/%{kernel_release}/kernel
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/6133b03ba349175a5dd4e5aaacea9a73c2a95115



More information about the pld-cvs-commit mailing list