[kernel] r13934 - in dists/trunk/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Wed Jul 15 01:23:53 2009
New Revision: 13934

Log:
Add firmware-linux-free package containing DFSG-free firmware.
Make kernel image packages recommend it.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
   dists/trunk/linux-2.6/debian/templates/control.main.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Jul 14 13:30:31 2009	(r13933)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jul 15 01:23:53 2009	(r13934)
@@ -18,6 +18,7 @@
   [ Ben Hutchings ]
   * mga: remove unnecessary change from firmware-loading patch
   * cxgb3: remove PHY firmware and use request_firmware() to load it
+  * Add firmware-linux-free package containing DFSG-free firmware
 
   [ Martin Michlmayr ]
   * [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Tue Jul 14 13:30:31 2009	(r13933)
+++ dists/trunk/linux-2.6/debian/rules.real	Wed Jul 15 01:23:53 2009	(r13934)
@@ -45,6 +45,7 @@
 binary-indep: install-source
 binary-indep: install-support
 binary-indep: install-tree
+binary-indep: install-firmware
 
 build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 
@@ -312,7 +313,6 @@
 	cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
 	cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
 	rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
-	# TODO: Move somewhere else
 	rm $(PACKAGE_DIR)/lib/firmware -rf
 endif
 	+$(MAKE_SELF) \
@@ -452,4 +452,18 @@
 install-tree:
 	+$(MAKE_SELF) install-dummy DH_OPTIONS='$(DH_OPTIONS)'
 
+install-firmware: PACKAGE_NAME = firmware-linux-free
+install-firmware: DIR = $(BUILD_DIR)/build-firmware
+install-firmware: SOURCE_DIR = $(BUILD_DIR)/source
+install-firmware: PACKAGE_DIR = debian/$(PACKAGE_NAME)
+install-firmware: DH_OPTIONS := -p$(PACKAGE_NAME)
+install-firmware: $(STAMPS_DIR)/source
+	dh_testdir
+	dh_testroot
+	dh_prep
+	rm -rf '$(DIR)'
+	mkdir '$(DIR)'
+	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' INSTALL_MOD_PATH='$(CURDIR)'/$(PACKAGE_DIR) firmware_install
+	+$(MAKE_SELF) install-base DH_OPTIONS='$(DH_OPTIONS)'
+
 # vim: filetype=make

Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in	Tue Jul 14 13:30:31 2009	(r13933)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in	Wed Jul 15 01:23:53 2009	(r13934)
@@ -2,6 +2,7 @@
 Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
 Pre-Depends: debconf | debconf-2.0
 Depends: module-init-tools, ${shlibs:Depends}
+Recommends: firmware-linux-free (>= @source_upstream@)
 Suggests: linux-doc- at version@
 Description: Linux @upstreamversion@ image on @class@
  This package provides the binary image and pre-built loadable modules for

Modified: dists/trunk/linux-2.6/debian/templates/control.main.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.main.in	Tue Jul 14 13:30:31 2009	(r13933)
+++ dists/trunk/linux-2.6/debian/templates/control.main.in	Wed Jul 15 01:23:53 2009	(r13934)
@@ -57,3 +57,13 @@
  Note that these patches do NOT apply against a pristine
  Linux @version@ kernel but only against the kernel tarball
  linux- at major@_ at source_upstream@.orig.tar.gz from the Debian archive.
+
+Package: firmware-linux-free
+Architecture: all
+Description: Binary firmware for various drivers in the Linux kernel
+ This package contains firmware which was previously included in the
+ Linux kernel and which is compliant with the Debian Free Software
+ Guidelines.
+ .
+ Most firmware previously included in the Linux kernel is non-free
+ and has been moved to the firmware-linux-nonfree package.