[kernel] r19504 - in dists/trunk/firmware-nonfree: debian debian/bin linux-nonfree
Ben Hutchings
benh at alioth.debian.org
Fri Nov 16 05:08:54 UTC 2012
Author: benh
Date: Fri Nov 16 05:08:53 2012
New Revision: 19504
Log:
linux-nonfree: Install a modprobe configuration file to enable radeon KMS, which will be disabled by default
Added:
dists/trunk/firmware-nonfree/linux-nonfree/modprobe.conf
Modified:
dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
dists/trunk/firmware-nonfree/debian/changelog
dists/trunk/firmware-nonfree/debian/rules.real
Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py Fri Nov 16 04:54:52 2012 (r19503)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py Fri Nov 16 05:08:53 2012 (r19504)
@@ -242,7 +242,7 @@
continue
# Whitelist files not expected to be installed as firmware
if f in ['copyright', 'defines', 'LICENSE', 'LICENSE.install',
- 'update.py', 'update.sh']:
+ 'modprobe.conf', 'update.py', 'update.sh']:
continue
files_unused.append(f)
Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog Fri Nov 16 04:54:52 2012 (r19503)
+++ dists/trunk/firmware-nonfree/debian/changelog Fri Nov 16 05:08:53 2012 (r19504)
@@ -5,6 +5,8 @@
* iwlwifi: Add new driver names and full Intel product names to package
description
* linux: Recommend intel-microcode, amd64-microcode (Closes: #692604)
+ * linux-nonfree: Install a modprobe configuration file to enable radeon
+ KMS, which will be disabled by default
-- Ben Hutchings <ben at decadent.org.uk> Sun, 24 Jun 2012 22:56:53 +0100
Modified: dists/trunk/firmware-nonfree/debian/rules.real
==============================================================================
--- dists/trunk/firmware-nonfree/debian/rules.real Fri Nov 16 04:54:52 2012 (r19503)
+++ dists/trunk/firmware-nonfree/debian/rules.real Fri Nov 16 05:08:53 2012 (r19504)
@@ -34,6 +34,10 @@
echo ln -s "$$target" "$$link"; \
ln -s "$$target" "$$link"; \
done
+ if [ -f $(PACKAGE)/modprobe.conf ]; then \
+ install -m644 -D $(PACKAGE)/modprobe.conf \
+ debian/$(PACKAGE_NAME)/etc/modprobe.d/$(PACKAGE_NAME).conf; \
+ fi
dh_bugfiles
dh_installchangelogs
dh_installdocs
Added: dists/trunk/firmware-nonfree/linux-nonfree/modprobe.conf
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/firmware-nonfree/linux-nonfree/modprobe.conf Fri Nov 16 05:08:53 2012 (r19504)
@@ -0,0 +1,3 @@
+# radeon KMS is unstable without firmware installed, so it is disabled
+# by default and enabled by this package (firmware-linux-nonfree).
+options radeon modeset=1
More information about the Kernel-svn-changes
mailing list