From 235af898af6ce44d66b22d36df764dc070b9e4b5 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 3 Sep 2010 23:18:42 +0200 Subject: [PATCH] udev: update to udev-162 Signed-off-by: Stephan Raue --- packages/sysutils/udev/build | 3 ++ ...0_udev-162_remove_keymap_and_acl-0.1.diff} | 28 ++++++++++--------- packages/sysutils/udev/url | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) rename packages/sysutils/udev/patches/{10_udev-159_remove_keymap_and_acl-0.1.diff => 10_udev-162_remove_keymap_and_acl-0.1.diff} (90%) diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build index 42e8fc6cfa..09c27d94cf 100755 --- a/packages/sysutils/udev/build +++ b/packages/sysutils/udev/build @@ -31,6 +31,9 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \ --disable-debug \ --disable-logging \ --enable-extras \ + --without-selinux \ + --without-systemdsystemunitdir \ + --with-firmware-path=/lib/firmware \ --with-pci-ids-path=/usr/share/pci.ids \ --disable-introspection \ --with-gnu-ld \ diff --git a/packages/sysutils/udev/patches/10_udev-159_remove_keymap_and_acl-0.1.diff b/packages/sysutils/udev/patches/10_udev-162_remove_keymap_and_acl-0.1.diff similarity index 90% rename from packages/sysutils/udev/patches/10_udev-159_remove_keymap_and_acl-0.1.diff rename to packages/sysutils/udev/patches/10_udev-162_remove_keymap_and_acl-0.1.diff index a15c0dbcfe..c258e4148f 100644 --- a/packages/sysutils/udev/patches/10_udev-159_remove_keymap_and_acl-0.1.diff +++ b/packages/sysutils/udev/patches/10_udev-162_remove_keymap_and_acl-0.1.diff @@ -1,7 +1,7 @@ -diff -Naur udev-159/configure.ac udev-159.patch/configure.ac ---- udev-159/configure.ac 2010-06-25 10:20:08.000000000 +0200 -+++ udev-159.patch/configure.ac 2010-07-07 15:39:38.655771428 +0200 -@@ -82,9 +82,6 @@ +diff -Naur udev-162/configure.ac udev-162.patch/configure.ac +--- udev-162/configure.ac 2010-09-03 10:11:37.000000000 +0200 ++++ udev-162.patch/configure.ac 2010-09-03 23:14:46.552571286 +0200 +@@ -84,9 +84,6 @@ AC_SUBST([GLIB_CFLAGS]) AC_SUBST([GLIB_LIBS]) @@ -11,10 +11,10 @@ diff -Naur udev-159/configure.ac udev-159.patch/configure.ac PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12) AC_SUBST(LIBUSB_CFLAGS) AC_SUBST(LIBUSB_LIBS) -diff -Naur udev-159/Makefile.am udev-159.patch/Makefile.am ---- udev-159/Makefile.am 2010-07-07 06:42:48.000000000 +0200 -+++ udev-159.patch/Makefile.am 2010-07-07 15:41:02.936771039 +0200 -@@ -426,21 +426,6 @@ +diff -Naur udev-162/Makefile.am udev-162.patch/Makefile.am +--- udev-162/Makefile.am 2010-09-03 13:19:05.000000000 +0200 ++++ udev-162.patch/Makefile.am 2010-09-03 23:16:04.628571420 +0200 +@@ -441,21 +441,6 @@ libexec_PROGRAMS += extras/hid2hci/hid2hci # ------------------------------------------------------------------------------ @@ -36,11 +36,10 @@ diff -Naur udev-159/Makefile.am udev-159.patch/Makefile.am # usb-db - read USB vendor/device string database # ------------------------------------------------------------------------------ extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c -@@ -486,104 +471,6 @@ - dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules +@@ -502,106 +487,6 @@ libexec_PROGRAMS += extras/mtd_probe/mtd_probe -- + - -# ------------------------------------------------------------------------------ -# keymap - map custom hardware's multimedia keys @@ -91,6 +90,7 @@ diff -Naur udev-159/Makefile.am udev-159.patch/Makefile.am - extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ - extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ - extras/keymap/keymaps/lenovo-3000 \ +- extras/keymap/keymaps/lenovo-ideapad \ - extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ - extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ - extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ @@ -108,6 +108,7 @@ diff -Naur udev-159/Makefile.am udev-159.patch/Makefile.am - extras/keymap/keymaps/module-sony \ - extras/keymap/keymaps/module-sony-old \ - extras/keymap/keymaps/olpc-xo \ +- extras/keymap/keymaps/onkyo \ - extras/keymap/keymaps/oqo-model2 \ - extras/keymap/keymaps/samsung-other \ - extras/keymap/keymaps/samsung-sq1us \ @@ -137,7 +138,8 @@ diff -Naur udev-159/Makefile.am udev-159.patch/Makefile.am - -keymaps-distcheck-hook: extras/keymap/keys.txt - $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^ --DISTCHECK_HOOKS = keymaps-distcheck-hook - +-DISTCHECK_HOOKS += keymaps-distcheck-hook +- endif # ENABLE_EXTRAS + # ------------------------------------------------------------------------------ diff --git a/packages/sysutils/udev/url b/packages/sysutils/udev/url index db22494be4..6ea1540c3e 100644 --- a/packages/sysutils/udev/url +++ b/packages/sysutils/udev/url @@ -1 +1 @@ -http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-161.tar.bz2 +http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/udev-162.tar.bz2