[kernel] r19505 - in dists/trunk/firmware-nonfree: debian debian/bin linux-nonfree

[Ben Hutchings]

Author: benh
Date: Sat Nov 17 05:27:38 2012
New Revision: 19505

Log:
Revert revision 19504 "linux-nonfree: Install a modprobe configuration file..."

This doesn't solve the problem, as:
- radeon KMS is broken on !x86
- For x86, xserver-xorg-video-radeon also installs a file like this,
  and there's no obvious way to transition away from that

Modified:
   dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/rules.real
   dists/trunk/firmware-nonfree/linux-nonfree/modprobe.conf

Modified: dists/trunk/firmware-nonfree/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Fri Nov 16 05:08:53 2012	(r19504)
+++ dists/trunk/firmware-nonfree/debian/bin/gencontrol.py	Sat Nov 17 05:27:38 2012	(r19505)
@@ -242,7 +242,7 @@
                         continue
                 # Whitelist files not expected to be installed as firmware
                 if f in ['copyright', 'defines', 'LICENSE', 'LICENSE.install',
-                         'modprobe.conf', 'update.py', 'update.sh']:
+                         '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 05:08:53 2012	(r19504)
+++ dists/trunk/firmware-nonfree/debian/changelog	Sat Nov 17 05:27:38 2012	(r19505)
@@ -5,8 +5,6 @@
   * 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 05:08:53 2012	(r19504)
+++ dists/trunk/firmware-nonfree/debian/rules.real	Sat Nov 17 05:27:38 2012	(r19505)
@@ -34,10 +34,6 @@
 	  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

Modified: dists/trunk/firmware-nonfree/linux-nonfree/modprobe.conf
==============================================================================
--- dists/trunk/firmware-nonfree/linux-nonfree/modprobe.conf	Fri Nov 16 05:08:53 2012	(r19504)
+++ dists/trunk/firmware-nonfree/linux-nonfree/modprobe.conf	Sat Nov 17 05:27:38 2012	(r19505)
@@ -1,3 +0,0 @@
-# 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