- update to udev-150
This commit is contained in:
Stephan Raue 2010-01-07 22:09:42 +01:00
parent 0bc4368422
commit c5fe1b637f
4 changed files with 150 additions and 10274 deletions

View File

@ -9,6 +9,8 @@ $SCRIPTS/build usbutils
$SCRIPTS/build libusb-compat
cd $PKG_BUILD
autoreconf
ac_cv_file__usr_share_pci_ids="yes" \
ac_cv_file__usr_share_hwdata_pci_ids="no" \
ac_cv_file__usr_share_misc_pci_ids="no" \

View File

@ -0,0 +1,147 @@
diff -Naur udev-150/configure.ac udev-150.patch/configure.ac
--- udev-150/configure.ac 2010-01-07 17:15:22.000000000 +0100
+++ udev-150.patch/configure.ac 2010-01-07 22:07:32.572877566 +0100
@@ -59,9 +59,6 @@
AC_SUBST([GLIB_CFLAGS])
AC_SUBST([GLIB_LIBS])
- AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
- AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
-
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-150/Makefile.am udev-150.patch/Makefile.am
--- udev-150/Makefile.am 2010-01-07 16:18:17.000000000 +0100
+++ udev-150.patch/Makefile.am 2010-01-07 22:06:37.791003407 +0100
@@ -421,21 +421,6 @@
libexec_PROGRAMS += extras/hid2hci/hid2hci
# ------------------------------------------------------------------------------
-# udev_acl - apply ACLs for users with local forground sessions
-# ------------------------------------------------------------------------------
-extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c
-extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
-extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS)
-dist_udevrules_DATA += extras/udev-acl/70-acl.rules
-libexec_PROGRAMS += extras/udev-acl/udev-acl
-
-udevacl-install-hook:
- mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
- ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
-
-INSTALL_EXEC_HOOKS += udevacl-install-hook
-
-# ------------------------------------------------------------------------------
# usb-db - read USB vendor/device string database
# ------------------------------------------------------------------------------
extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
@@ -471,98 +456,6 @@
libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
-# ------------------------------------------------------------------------------
-# keymap - map custom hardware's multimedia keys
-# ------------------------------------------------------------------------------
-extras_keymap_keymap_SOURCES = extras/keymap/keymap.c
-extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap
-nodist_extras_keymap_keymap_SOURCES = \
- extras/keymap/keys-from-name.h \
- extras/keymap/keys-to-name.h
-BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
-
-EXTRA_DIST += extras/keymap/check-keymaps.sh
-dist_udevrules_DATA += extras/keymap/95-keymap.rules
-dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules
-libexec_PROGRAMS += extras/keymap/keymap
-dist_libexec_SCRIPTS += extras/keymap/findkeyboards
-dist_libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
-dist_doc_DATA = extras/keymap/README.keymap.txt
-
-CLEANFILES += \
- extras/keymap/keys.txt \
- extras/keymap/keys-from-name.gperf
-
-udevkeymapdir = $(libexecdir)/keymaps
-dist_udevkeymap_DATA = \
- extras/keymap/keymaps/acer \
- extras/keymap/keymaps/acer-aspire_5720 \
- extras/keymap/keymaps/acer-aspire_5920g \
- extras/keymap/keymaps/acer-aspire_6920 \
- extras/keymap/keymaps/acer-travelmate_c300 \
- extras/keymap/keymaps/asus \
- extras/keymap/keymaps/compaq-e_evo \
- extras/keymap/keymaps/dell \
- extras/keymap/keymaps/everex-xt5000 \
- extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
- extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
- extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \
- extras/keymap/keymaps/fujitsu-amilo_si_1520 \
- extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
- extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
- extras/keymap/keymaps/hewlett-packard \
- extras/keymap/keymaps/hewlett-packard-2510p_2530p \
- extras/keymap/keymaps/hewlett-packard-compaq_elitebook \
- extras/keymap/keymaps/hewlett-packard-pavilion \
- extras/keymap/keymaps/hewlett-packard-presario-2100 \
- extras/keymap/keymaps/hewlett-packard-tablet \
- extras/keymap/keymaps/hewlett-packard-tx2 \
- extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
- extras/keymap/keymaps/lenovo-3000 \
- 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/logitech-wave \
- extras/keymap/keymaps/logitech-wave-cordless \
- extras/keymap/keymaps/maxdata-pro_7000 \
- extras/keymap/keymaps/medion-fid2060 \
- extras/keymap/keymaps/medionnb-a555 \
- extras/keymap/keymaps/micro-star \
- extras/keymap/keymaps/module-asus-w3j \
- extras/keymap/keymaps/module-ibm \
- extras/keymap/keymaps/module-lenovo \
- extras/keymap/keymaps/module-sony \
- extras/keymap/keymaps/module-sony-old \
- extras/keymap/keymaps/olpc-xo \
- extras/keymap/keymaps/oqo-model2 \
- extras/keymap/keymaps/samsung-other \
- extras/keymap/keymaps/samsung-sq1us \
- extras/keymap/keymaps/samsung-sx20s \
- extras/keymap/keymaps/toshiba-satellite_a100 \
- extras/keymap/keymaps/toshiba-satellite_a110 \
- extras/keymap/keymaps/zepto-znote
-
-udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
-dist_udevkeymapforcerel_DATA = \
- extras/keymap/keymaps/force-release/samsung-other
-
-extras/keymap/keys.txt: /usr/include/linux/input.h
- mkdir -p extras/keymap
- $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-
-extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
-
-extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile
- $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
-
-extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
-keymaps-distcheck-hook: extras/keymap/keys.txt
- $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS = keymaps-distcheck-hook
-
endif # ENABLE_EXTRAS
# ------------------------------------------------------------------------------

View File

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