packages: kernel/kernel.spec - firmware subpackage (optional)

[glen]

Author: glen                         Date: Sun Jan 31 02:12:47 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- firmware subpackage (optional)

---- Files affected:
packages/kernel:
   kernel.spec (1.746 -> 1.747) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.746 packages/kernel/kernel.spec:1.747
--- packages/kernel/kernel.spec:1.746	Thu Jan  7 09:19:50 2010
+++ packages/kernel/kernel.spec	Sun Jan 31 03:12:42 2010
@@ -9,8 +9,7 @@
 #
 # TODO:
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
-# - add a subpackage (kernel-firmware?) for ~35 firmware files
-# - update or remove tahoe9xx patch2 
+# - update or remove tahoe9xx patch2
 # - update or remove mpt-fusion patch90
 # - update grsec_minimal patch1000:
 #   fs/proc/base.c:1484: error: 'struct task_struct' has no member named 'uid'
@@ -201,7 +200,7 @@
 
 # netfilter related stuff mostly based on patch-o-matic-ng
 # snapshot 20070806 with some fixes. Some modules
-# were ported to nf_conntrack. 
+# were ported to nf_conntrack.
 
 Patch10:	kernel-pom-ng-IPV4OPTSSTRIP.patch
 Patch11:	kernel-pom-ng-ipv4options.patch
@@ -337,10 +336,10 @@
 %ifarch ppc
 BuildRequires:	uboot-mkimage
 %endif
-AutoReqProv:	no
 BuildRequires:	/sbin/depmod
 BuildRequires:	gcc >= 5:3.2
 BuildRequires:	xz >= 1:4.999.7
+AutoReqProv:	no
 # for hostname command
 BuildRequires:	net-tools
 BuildRequires:	perl-base
@@ -353,6 +352,7 @@
 Requires:	coreutils
 Requires:	geninitrd >= 10000-3
 Requires:	module-init-tools >= 0.9.9
+Suggests:	%{name}-firmware = %{kernel_release}
 Provides:	%{name}(netfilter) = %{netfilter_snap}
 Provides:	%{name}(vermagic) = %{kernel_release}
 Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
@@ -551,6 +551,17 @@
 %description pcmcia -l pl.UTF-8
 Moduły PCMCIA.
 
+%package firmware
+Summary:	Firmware files used by the Linux kernel
+Group:		Base/Kernel
+# This is... complicated.
+# Look at the WHENCE file.
+License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
+
+%description firmware
+Kernel-firmware includes firmware files required for some devices to
+operate.
+
 %package sound-alsa
 Summary:	ALSA kernel modules
 Summary(de.UTF-8):	ALSA Kernel Module
@@ -911,7 +922,7 @@
 	# Now we have to check MAC system integration. Grsecurity (full) uses PAX_HAVE_ACL_FLAGS
 	# setting (direct acces). grsec_minimal probably have no idea about PaX so we probably
 	# could use PAX_NO_ACL_FLAGS, but for testing the hooks setting will be used
-	# PAX_HOOK_ACL_FLAGS. 
+	# PAX_HOOK_ACL_FLAGS.
 
 	%if %{with grsec_full}
 		# Hardening grsec options if with pax
@@ -1309,7 +1320,6 @@
 /boot/vmlinuz-%{kernel_release}
 /boot/System.map-%{kernel_release}
 %ghost %{initrd_dir}/initrd-%{kernel_release}.gz
-/lib/firmware/%{kernel_release}
 
 %dir /lib/modules/%{kernel_release}
 %dir /lib/modules/%{kernel_release}/kernel
@@ -1391,6 +1401,11 @@
 /boot/vmlinux-%{kernel_release}
 %endif
 
+%files firmware
+%defattr(644,root,root,755)
+#%doc Documentation/WHENCE
+/lib/firmware/%{kernel_release}
+
 %if %{have_drm}
 %files drm
 %defattr(644,root,root,755)
@@ -1577,6 +1592,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.747  2010/01/31 02:12:42  glen
+- firmware subpackage (optional)
+
 Revision 1.746  2010/01/07 08:19:50  arekm
 - up to 2.6.32.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.746&r2=1.747&f=u