tags 705784 + patch
tags 705784 + pending
thanks

I've prepared and uploaded an NMU for udev (versioned as 175-7.2)
as previously agreed.

Ben.

-- 
Ben Hutchings
Sturgeon's Law: Ninety percent of everything is crap.
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 <b...@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
 +

Attachment: signature.asc
Description: Digital signature

Reply via email to