Bug#706367: unblock: udev/175-7.2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package udev
This is a one-line configuration change that avoids a serious
regression on OLPC XO-1 machines. However, the configuration file is
supposed to be updated by a script (outside of dpkg-buildpackage) so I
also updated that accordingly to reduce the risk of future regression.
diff -Nru udev-175/debian/changelog udev-175/debian/changelog
--- udev-175/debian/changelog 2012-11-05 07:58:16.000000000 +0000
+++ udev-175/debian/changelog 2013-04-28 22:29:35.000000000 +0100
@@ -1,3 +1,10 @@
+udev (175-7.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove blacklisting of lxfb (Closes: #705784)
+
+ -- Ben Hutchings <ben@decadent.org.uk> Sun, 28 Apr 2013 22:29:35 +0100
+
udev (175-7.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru udev-175/debian/patches/extra_modprobeconf udev-175/debian/patches/extra_modprobeconf
--- udev-175/debian/patches/extra_modprobeconf 2012-08-19 22:15:38.000000000 +0100
+++ udev-175/debian/patches/extra_modprobeconf 2013-04-28 22:43:05.000000000 +0100
@@ -1,7 +1,7 @@
--- /dev/null
+++ b/extra/fbdev-blacklist.conf
-@@ -0,0 +1,25 @@
-+# This file blacklists the framebuffer drivers.
+@@ -0,0 +1,24 @@
++# This file blacklists most old-style PCI framebuffer drivers.
+
+blacklist arkfb
+blacklist aty128fb
@@ -11,7 +11,6 @@
+blacklist cyber2000fb
+blacklist gx1fb
+blacklist gxfb
-+blacklist lxfb
+blacklist kyrofb
+blacklist matroxfb_base
+blacklist mb862xxfb
@@ -28,24 +27,45 @@
+blacklist vt8623fb
--- /dev/null
+++ b/extra/make-fbdev-blacklist
-@@ -0,0 +1,26 @@
+@@ -0,0 +1,47 @@
+#!/bin/sh
+# This script should be run before building the package every time a new
+# kernel is released.
++#
++# You should pass the name of the modules directory for a 486 flavour
++# kernel, as that has the most framebuffer modules.
++#
++# Also, obsolete modules should not be removed from the list until after
++# at least one stable release.
+
+set -e
+
++if [ $# = 0 ]; then
++ MODULES_DIR=/lib/modules/$(uname -r)
++else
++ MODULES_DIR="$1"
++fi
++
+BL='fbdev-blacklist.conf'
+
+if [ -e extra/$BL ]; then cd extra; fi
+
+{
-+printf "# This file blacklists the framebuffer drivers.\n\n"
++printf "# This file blacklists most old-style PCI framebuffer drivers.\n\n"
+
-+find /lib/modules/$(uname -r)/kernel/drivers/video -type f | sort | \
++find "$MODULES_DIR"/kernel/drivers/video -type f | sort | \
+while read file; do
-+ /sbin/modinfo $file | grep -q '^alias: *pci:' \
-+ && echo blacklist $(basename $file .ko) || true
++ name="$(basename $file .ko)"
++ case $name in
++ lxfb)
++ # This is needed for text consoles on OLPC XO-1, and it used to be
++ # built-in anyway.
++ ;;
++ *)
++ /sbin/modinfo $file | grep -q '^alias: *pci:' \
++ && echo blacklist $name || true
++ ;;
++ esac
+done
+} > $BL.tmp
+
--- END ---
unblock udev/175-7.2
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (x86_64)
Foreign Architectures: amd64
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Reply to: