[arch-commits] Commit in udev/trunk (4 files)
Thomas Bächler
thomas at archlinux.org
Thu Jun 3 10:48:59 UTC 2010
Date: Thursday, June 3, 2010 @ 06:48:58
Author: thomas
Revision: 81777
Prepare udev 157 release
Modified:
udev/trunk/PKGBUILD
udev/trunk/arch-udev-rules.patch
Deleted:
udev/trunk/firmware-loader-fix-missing-firmware.patch
udev/trunk/ignore-remove.sh
--------------------------------------------+
PKGBUILD | 18 +++---------
arch-udev-rules.patch | 38 ++++++++++-----------------
firmware-loader-fix-missing-firmware.patch | 27 -------------------
ignore-remove.sh | 13 ---------
4 files changed, 20 insertions(+), 76 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-06-03 10:13:45 UTC (rev 81776)
+++ PKGBUILD 2010-06-03 10:48:58 UTC (rev 81777)
@@ -5,8 +5,8 @@
pkgbase="udev"
pkgname=('udev' 'udev-compat')
-pkgver=151
-pkgrel=3
+pkgver=157
+pkgrel=1
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
@@ -16,22 +16,16 @@
makedepends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
81-arch.rules load-modules.sh cdsymlinks.sh root-link.sh
- arch-udev-rules.patch ignore-remove.sh
- firmware-loader-fix-missing-firmware.patch)
-md5sums=('aeae0e6273dcbec246c3c1b9868ebed1'
+ arch-udev-rules.patch)
+md5sums=('0ea39cc875116982abf200eb16c1b53e'
'6393ee81993f8b9beb776ca904005864'
'f91fddc67609b45b244a624977c4247b'
'2e808ee78d237c478b57af2a68d43769'
'2d6dc6842464f107bccc68cd505a6c31'
- '22c1f059cdeddaac5e7fe33b007da6a3'
- '35fa97500243a79b2370fa4684828e69'
- 'ec1fa2ecaff2e8efc611cb70568630ad')
+ '70198227b7bbe3852e1cd2299693af66')
build() {
cd $srcdir/$pkgname-$pkgver
- # The new firmware loader has a bug where modprobe will hang 60 seconds when a
- # firmware file is missing. Fix this by properly reporting error to the kernel
- patch -p1 -i "$srcdir"/firmware-loader-fix-missing-firmware.patch || return 1
./configure --prefix="" --mandir=/usr/share/man\
--includedir=/usr/include\
--libexecdir=/lib/udev\
@@ -64,8 +58,6 @@
install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
# install root-link.sh
install -D -m755 $srcdir/root-link.sh $pkgdir/lib/udev/root-link.sh
- # install ignore-remove.sh
- install -D -m755 $srcdir/ignore-remove.sh $pkgdir/lib/udev/ignore-remove.sh
# disable error logging to prevent startup failures printed to vc on boot
sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf
# install additional standard rules files
Modified: arch-udev-rules.patch
===================================================================
--- arch-udev-rules.patch 2010-06-03 10:13:45 UTC (rev 81776)
+++ arch-udev-rules.patch 2010-06-03 10:48:58 UTC (rev 81777)
@@ -24,35 +24,27 @@
# block-related
KERNEL=="sch[0-9]*", GROUP="disk"
-@@ -116,5 +116,4 @@
- KERNEL=="rrom[0-9]*", MODE="0400"
-
- # do not delete static device nodes
--ACTION=="remove", NAME=="", TEST=="/lib/udev/devices/%k", OPTIONS+="ignore_remove"
--ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
-+ACTION=="remove", PROGRAM="ignore-remove.sh %r", OPTIONS+="ignore_remove"
diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
---- rules.d/80-drivers.rules 2009-03-07 22:22:48.200242883 +0100
-+++ rules.d.arch/80-drivers.rules 2009-03-07 22:22:54.757744454 +0100
-@@ -2,13 +2,14 @@
+--- rules.d/80-drivers.rules 2010-06-03 11:55:08.978720002 +0200
++++ rules.d.arch/80-drivers.rules 2010-06-03 11:58:41.207865142 +0200
+@@ -2,12 +2,13 @@
- ACTION!="add", GOTO="drivers_end"
+ ACTION=="remove", GOTO="drivers_end"
--DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe -b $env{MODALIAS}"
--SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -b tifm_sd"
--SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -b tifm_ms"
--SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block"
--SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -b i2o_block"
--SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -b sg"
--SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -b ppdev"
-+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
-+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
-+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
+-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe -bv $env{MODALIAS}"
+-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -bv tifm_sd"
+-SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -bv tifm_ms"
+-SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -bv --all ms_block mspro_block"
+-SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -bv i2o_block"
+-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -bv sg"
+-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -bv ppdev"
++DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
++SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
++SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
-+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
++SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
LABEL="drivers_end"
-
Deleted: firmware-loader-fix-missing-firmware.patch
===================================================================
--- firmware-loader-fix-missing-firmware.patch 2010-06-03 10:13:45 UTC (rev 81776)
+++ firmware-loader-fix-missing-firmware.patch 2010-06-03 10:48:58 UTC (rev 81777)
@@ -1,27 +0,0 @@
-diff -Nur udev-151.orig/extras/firmware/firmware.c udev-151/extras/firmware/firmware.c
---- udev-151.orig/extras/firmware/firmware.c 2009-12-15 16:19:30.000000000 +0100
-+++ udev-151/extras/firmware/firmware.c 2010-01-31 13:17:09.195896260 +0100
-@@ -149,6 +149,7 @@
-
- util_path_encode(firmware, fwencpath, sizeof(fwencpath));
- util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL);
-+ util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
-
- if (fwfile == NULL) {
- int err;
-@@ -166,6 +167,7 @@
- udev_selinux_resetfscreatecon(udev);
- } while (err == -ENOENT);
- rc = 2;
-+ set_loading(udev, loadpath, "-1");
- goto exit;
- }
-
-@@ -176,7 +178,6 @@
- if (unlink(misspath) == 0)
- util_delete_path(udev, misspath);
-
-- util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
- set_loading(udev, loadpath, "1");
-
- util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL);
Deleted: ignore-remove.sh
===================================================================
--- ignore-remove.sh 2010-06-03 10:13:45 UTC (rev 81776)
+++ ignore-remove.sh 2010-06-03 10:48:58 UTC (rev 81777)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ -z "$1" ]; then
- exit 1
-fi
-
-for f in ${DEVNAME} ${DEVLINKS}; do
- if [ -e "/lib/udev/devices/${f#$1}" ]; then
- exit 0
- fi
-done
-
-exit 1
More information about the arch-commits
mailing list