Add firmware-linux-free package containing DFSG-free firmware.
Make kernel image packages recommend it. svn path=/dists/trunk/linux-2.6/; revision=13934
This commit is contained in:
parent
61f1596c65
commit
b4830dbdb1
|
@ -18,6 +18,7 @@ linux-2.6 (2.6.31~rc3-1~experimental.1) UNRELEASED; urgency=low
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* mga: remove unnecessary change from firmware-loading patch
|
* mga: remove unnecessary change from firmware-loading patch
|
||||||
* cxgb3: remove PHY firmware and use request_firmware() to load it
|
* cxgb3: remove PHY firmware and use request_firmware() to load it
|
||||||
|
* Add firmware-linux-free package containing DFSG-free firmware
|
||||||
|
|
||||||
[ Martin Michlmayr ]
|
[ Martin Michlmayr ]
|
||||||
* [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these
|
* [armel/orion5x, armel/kirkwood] Set GPIO_SYSFS=y since these
|
||||||
|
|
|
@ -45,6 +45,7 @@ binary-indep: install-patch
|
||||||
binary-indep: install-source
|
binary-indep: install-source
|
||||||
binary-indep: install-support
|
binary-indep: install-support
|
||||||
binary-indep: install-tree
|
binary-indep: install-tree
|
||||||
|
binary-indep: install-firmware
|
||||||
|
|
||||||
build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
|
build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
|
||||||
|
|
||||||
|
@ -312,7 +313,6 @@ ifeq ($(MODULES),True)
|
||||||
cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
|
cp $(DIR)/.config $(PACKAGE_DIR)/boot/config-$(REAL_VERSION)
|
||||||
cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
|
cp $(DIR)/System.map $(PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
|
||||||
rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
|
rm $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source,modules.*}
|
||||||
# TODO: Move somewhere else
|
|
||||||
rm $(PACKAGE_DIR)/lib/firmware -rf
|
rm $(PACKAGE_DIR)/lib/firmware -rf
|
||||||
endif
|
endif
|
||||||
+$(MAKE_SELF) \
|
+$(MAKE_SELF) \
|
||||||
|
@ -452,4 +452,18 @@ install-tree: DH_OPTIONS = -plinux-tree-$(VERSION)
|
||||||
install-tree:
|
install-tree:
|
||||||
+$(MAKE_SELF) install-dummy DH_OPTIONS='$(DH_OPTIONS)'
|
+$(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
|
# vim: filetype=make
|
||||||
|
|
|
@ -2,6 +2,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@
|
||||||
Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
|
Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
|
||||||
Pre-Depends: debconf | debconf-2.0
|
Pre-Depends: debconf | debconf-2.0
|
||||||
Depends: module-init-tools, ${shlibs:Depends}
|
Depends: module-init-tools, ${shlibs:Depends}
|
||||||
|
Recommends: firmware-linux-free (>= @source_upstream@)
|
||||||
Suggests: linux-doc-@version@
|
Suggests: linux-doc-@version@
|
||||||
Description: Linux @upstreamversion@ image on @class@
|
Description: Linux @upstreamversion@ image on @class@
|
||||||
This package provides the binary image and pre-built loadable modules for
|
This package provides the binary image and pre-built loadable modules for
|
||||||
|
|
|
@ -57,3 +57,13 @@ Description: Debian patches to version @version@ of the Linux kernel
|
||||||
Note that these patches do NOT apply against a pristine
|
Note that these patches do NOT apply against a pristine
|
||||||
Linux @version@ kernel but only against the kernel tarball
|
Linux @version@ kernel but only against the kernel tarball
|
||||||
linux-@major@_@source_upstream@.orig.tar.gz from the Debian archive.
|
linux-@major@_@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.
|
||||||
|
|
Loading…
Reference in New Issue