- update to udev-153
This commit is contained in:
Stephan Raue 2010-04-21 19:05:40 +02:00
parent 3edb830139
commit 8e35da4343
5 changed files with 16 additions and 47 deletions

View File

@ -6,6 +6,6 @@
progress "request udev events from the kernel"
(
$NICE_20 udevadm trigger
$NICE_20 udevadm trigger --action=add
$NICE_20 udevadm settle
)&

View File

@ -39,7 +39,7 @@ mkdir -p $INSTALL/lib/udev
for i in ata_id cdrom_id collect edd_id fstab_import path_id scsi_id usb_id v4l_id; do
cp $PKG_BUILD/extras/$i/$i $INSTALL/lib/udev
done
cp $PKG_BUILD/extras/input_id/.libs/input_id $INSTALL/lib/udev
cp $PKG_BUILD/extras/input_id/input_id $INSTALL/lib/udev
cp $PKG_BUILD/extras/usb-db/usb-db $INSTALL/lib/udev
cp $PKG_BUILD/extras/usb-db/pci-db $INSTALL/lib/udev

View File

@ -1,6 +1,6 @@
diff -Naur udev-151/configure.ac udev-151.patch/configure.ac
--- udev-151/configure.ac 2010-01-25 08:21:07.000000000 +0100
+++ udev-151.patch/configure.ac 2010-01-28 11:28:53.751387076 +0100
diff -Naur udev-153/configure.ac udev-153.patch/configure.ac
--- udev-153/configure.ac 2010-04-21 08:30:43.000000000 +0200
+++ udev-153.patch/configure.ac 2010-04-21 17:47:39.531454320 +0200
@@ -59,9 +59,6 @@
AC_SUBST([GLIB_CFLAGS])
AC_SUBST([GLIB_LIBS])
@ -11,20 +11,10 @@ diff -Naur udev-151/configure.ac udev-151.patch/configure.ac
PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
AC_SUBST(LIBUSB_CFLAGS)
AC_SUBST(LIBUSB_LIBS)
@@ -69,9 +66,6 @@
PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
- AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
- AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
- AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
AC_ARG_WITH(pci-ids-path,
AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
[PCI_DATABASE=${withval}],
diff -Naur udev-151/Makefile.am udev-151.patch/Makefile.am
--- udev-151/Makefile.am 2010-01-25 10:47:41.000000000 +0100
+++ udev-151.patch/Makefile.am 2010-01-28 11:28:04.497252400 +0100
@@ -417,21 +417,6 @@
diff -Naur udev-153/Makefile.am udev-153.patch/Makefile.am
--- udev-153/Makefile.am 2010-04-20 07:02:58.000000000 +0200
+++ udev-153.patch/Makefile.am 2010-04-21 17:47:06.705490633 +0200
@@ -418,21 +418,6 @@
libexec_PROGRAMS += extras/hid2hci/hid2hci
# ------------------------------------------------------------------------------
@ -46,9 +36,9 @@ diff -Naur udev-151/Makefile.am udev-151.patch/Makefile.am
# usb-db - read USB vendor/device string database
# ------------------------------------------------------------------------------
extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
@@ -467,98 +452,6 @@
@@ -465,101 +450,6 @@
libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
-# ------------------------------------------------------------------------------
-# keymap - map custom hardware's multimedia keys
@ -101,6 +91,7 @@ diff -Naur udev-151/Makefile.am udev-151.patch/Makefile.am
- extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
- extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
- extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
- extras/keymap/keymaps/lg-x110 \
- extras/keymap/keymaps/logitech-wave \
- extras/keymap/keymaps/logitech-wave-cordless \
- extras/keymap/keymaps/maxdata-pro_7000 \
@ -119,11 +110,13 @@ diff -Naur udev-151/Makefile.am udev-151.patch/Makefile.am
- extras/keymap/keymaps/samsung-sx20s \
- extras/keymap/keymaps/toshiba-satellite_a100 \
- extras/keymap/keymaps/toshiba-satellite_a110 \
- extras/keymap/keymaps/toshiba-satellite_m30x \
- extras/keymap/keymaps/zepto-znote
-
-udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
-dist_udevkeymapforcerel_DATA = \
- extras/keymap/force-release-maps/samsung-other
- extras/keymap/force-release-maps/samsung-other \
- extras/keymap/force-release-maps/common-volume-keys
-
-extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
- mkdir -p extras/keymap

View File

@ -1,24 +0,0 @@
diff -urN udev-150/rules/rules.d/60-persistent-storage.rules udev-150-new/rules/rules.d/60-persistent-storage.rules
--- udev-150/rules/rules.d/60-persistent-storage.rules 2009-12-09 01:43:09.000000000 +0800
+++ udev-150-new/rules/rules.d/60-persistent-storage.rules 2010-01-09 21:53:59.000000000 +0800
@@ -3,6 +3,8 @@
# persistent storage links: /dev/disk/{by-id,by-uuid,by-label,by-path}
# scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare@suse.de>
+ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_end"
+
# forward scsi device event to corresponding block device
ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
diff -urN udev-150/rules/rules.d/60-persistent-storage-tape.rules udev-150-new/rules/rules.d/60-persistent-storage-tape.rules
--- udev-150/rules/rules.d/60-persistent-storage-tape.rules 2009-12-03 20:45:03.000000000 +0800
+++ udev-150-new/rules/rules.d/60-persistent-storage-tape.rules 2010-01-09 21:54:26.000000000 +0800
@@ -2,6 +2,8 @@
# persistent storage links: /dev/tape/{by-id,by-path}
+ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_tape_end"
+
ACTION!="add|change", GOTO="persistent_storage_tape_end"
# type 8 devices are "Medium Changers"

View File

@ -1 +1 @@
http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-151.tar.bz2
http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-153.tar.bz2