udev: version bump 169 -> 170

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 9 insertions, 285 deletions

diff --git a/patches/udev-167/0001-split-enabling-extras-with-dependencies.patch b/patches/udev-167/0001-split-enabling-extras-with-dependencies.patch
deleted file mode 100644
index 3a3495d60..000000000
--- a/patches/udev-167/0001-split-enabling-extras-with-dependencies.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 21 Apr 2011 07:46:58 +0200
-Subject: [PATCH] split enabling extras with dependencies
-
-This patch patch makes it possible to enable all extras with external
-dependencies individually. It replaces:
-	--disable-extras
-with
-	--disable-gudev
-	--disable-bluetooth
-	--disable-keymap
-	--disable-acl
-	--disable-usbdb
-	--disable-pcidb
-	--disable-modem-modeswitch
-as configure options
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.am  |   27 +++++++++++++++++++++------
- configure.ac |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
- 2 files changed, 71 insertions(+), 15 deletions(-)
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -225,7 +225,6 @@ dist_udevrules_DATA += \
- 	extras/rule_generator/75-cd-aliases-generator.rules \
- 	extras/rule_generator/75-persistent-net-generator.rules
- 
--if ENABLE_EXTRAS
- # ------------------------------------------------------------------------------
- # firmware - firmware loading
- # ------------------------------------------------------------------------------
-@@ -314,14 +313,13 @@ extras_v4l_id_v4l_id_LDADD = libudev/lib
- libexec_PROGRAMS += extras/v4l_id/v4l_id
- dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
- 
--endif # ENABLE_EXTRAS
--
- # ------------------------------------------------------------------------------
- # qemu -- qemu/kvm guest tweaks
- # ------------------------------------------------------------------------------
- dist_udevrules_DATA += extras/qemu/42-qemu-usb.rules
- 
--if ENABLE_EXTRAS
-+if ENABLE_USBDB
-+if ENABLE_PCIDB
- # ------------------------------------------------------------------------------
- # conditional extras (need glib, libusb, libacl, ...)
- # ------------------------------------------------------------------------------
-@@ -329,7 +327,12 @@ dist_udevrules_DATA += \
- 	rules/rules.d/75-net-description.rules \
- 	rules/rules.d/75-tty-description.rules \
- 	rules/rules.d/78-sound-card.rules
-+endif # ENABLE_PCIDB
-+endif # ENABLE_USBDB
-+
-+BUILT_SOURCES =
- 
-+if ENABLE_GUDEV
- # ------------------------------------------------------------------------------
- # GUdev - libudev gobject interface
- # ------------------------------------------------------------------------------
-@@ -370,7 +373,7 @@ dist_extras_gudev_libgudev_1_0_la_SOURCE
- 	extras/gudev/gudevmarshal.c \
- 	extras/gudev/gudevenumtypes.h \
- 	extras/gudev/gudevenumtypes.c
--BUILT_SOURCES = $(dist_extras_gudev_libgudev_1_0_la_SOURCES)
-+BUILT_SOURCES += $(dist_extras_gudev_libgudev_1_0_la_SOURCES)
- 
- extras_gudev_libgudev_1_0_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS) \
-@@ -449,6 +452,7 @@ typelibs_DATA = extras/gudev/GUdev-1.0.t
- 
- CLEANFILES += $(gir_DATA) $(typelibs_DATA)
- endif # ENABLE_INTROSPECTION
-+endif # ENABLE_GUDEV
- 
- # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
- libgudev-install-move-hook:
-@@ -466,6 +470,7 @@ libgudev-uninstall-move-hook:
- INSTALL_EXEC_HOOKS += libgudev-install-move-hook
- UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
- 
-+if ENABLE_BLUETOOTH
- # ------------------------------------------------------------------------------
- # Bluetooth HID devices with special magic to switch the device
- # ------------------------------------------------------------------------------
-@@ -474,7 +479,9 @@ extras_hid2hci_hid2hci_CPPFLAGS = $(AM_C
- extras_hid2hci_hid2hci_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
- dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules
- libexec_PROGRAMS += extras/hid2hci/hid2hci
-+endif # ENABLE_BLUETOOTH
- 
-+if ENABLE_ACL
- # ------------------------------------------------------------------------------
- # udev_acl - apply ACLs for users with local forground sessions
- # ------------------------------------------------------------------------------
-@@ -489,7 +496,9 @@ udevacl-install-hook:
- 	ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
- 
- INSTALL_EXEC_HOOKS += udevacl-install-hook
-+endif # ENABLE_ACL
- 
-+if ENABLE_USBDB
- # ------------------------------------------------------------------------------
- # usb-db - read USB vendor/device string database
- # ------------------------------------------------------------------------------
-@@ -497,7 +506,9 @@ extras_usb_db_usb_db_SOURCES = extras/us
- extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
- extras_usb_db_usb_db_LDADD = libudev/libudev-private.la
- libexec_PROGRAMS += extras/usb-db/usb-db
-+endif # ENABLE_USBDB
- 
-+if ENABLE_PCIDB
- # ------------------------------------------------------------------------------
- # pci-db - read PCI vendor/device string database
- # ------------------------------------------------------------------------------
-@@ -505,7 +516,9 @@ extras_usb_db_pci_db_SOURCES = extras/us
- extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
- extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
- libexec_PROGRAMS += extras/usb-db/pci-db
-+endif # ENABLE_PCIDB
- 
-+if ENABLE_MOBILE_ACTION_MODESWITCH
- # ------------------------------------------------------------------------------
- # mobile-action-modeswitch - switch Mobile Action cables into serial mode
- # ------------------------------------------------------------------------------
-@@ -522,7 +535,9 @@ dist_udevrules_DATA += \
- 	extras/mobile-action-modeswitch/61-mobile-action.rules
- 
- libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
-+endif # ENABLE_MOBILE_ACTION_MODESWITCH
- 
-+if ENABLE_KEYMAP
- # ------------------------------------------------------------------------------
- # mtd_probe - autoloads FTL module for mtd devices
- # ------------------------------------------------------------------------------
-@@ -641,7 +656,7 @@ keymaps-distcheck-hook: extras/keymap/ke
- 	$(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
- DISTCHECK_HOOKS += keymaps-distcheck-hook
- 
--endif # ENABLE_EXTRAS
-+endif # ENABLE_KEYMAP
- 
- # ------------------------------------------------------------------------------
- # install, uninstall, clean hooks
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -73,29 +73,68 @@ if test "x$with_systemdsystemunitdir" !=
- fi
- AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
- 
--AC_ARG_ENABLE([extras],
--	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
--	[], [enable_extras=yes])
--if test "x$enable_extras" = xyes; then
-+AC_ARG_ENABLE([gudev],
-+	AS_HELP_STRING([--disable-gudev], [disable libgudev - libudev gobject interface]),
-+	[], [enable_gudev=yes])
-+AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = xyes])
-+AC_ARG_ENABLE([bluetooth],
-+	AS_HELP_STRING([--disable-bluetooth], [disable Bluetooth HID devices with special magic to switch the device]),
-+	[], [enable_bluetooth=yes])
-+AM_CONDITIONAL([ENABLE_BLUETOOTH], [test "x$enable_bluetooth" = xyes])
-+AC_ARG_ENABLE([keymap],
-+	AS_HELP_STRING([--disable-keymap], [disable keymap - map custom hardware's multimedia keys]),
-+	[], [enable_keymap=yes])
-+AM_CONDITIONAL([ENABLE_KEYMAP], [test "x$enable_keymap" = xyes])
-+AC_ARG_ENABLE([acl],
-+	AS_HELP_STRING([--disable-acl], [disable udev_acl - apply ACLs for users with local forground sessions]),
-+	[], [enable_acl=yes])
-+AM_CONDITIONAL([ENABLE_ACL], [test "x$enable_acl" = xyes])
-+AC_ARG_ENABLE([usbdb],
-+	AS_HELP_STRING([--disable-usbdb], [disable usb-db - read USB vendor/device string database]),
-+	[], [enable_usbdb=yes])
-+AM_CONDITIONAL([ENABLE_USBDB], [test "x$enable_usbdb" = xyes])
-+AC_ARG_ENABLE([pcidb],
-+	AS_HELP_STRING([--disable-pcidb], [disable pci-db - read PCI vendor/device string database]),
-+	[], [enable_pcidb=yes])
-+AM_CONDITIONAL([ENABLE_PCIDB], [test "x$enable_pcidb" = xyes])
-+AC_ARG_ENABLE([mobile-action-modeswitch],
-+	AS_HELP_STRING([--disable-mobile-action-modeswitch], [disable mobile-action-modeswitch - switch Mobile Action cables into serial mode]),
-+	[], [enable_mobile_action_modeswitch=yes])
-+AM_CONDITIONAL([ENABLE_MOBILE_ACTION_MODESWITCH], [test "x$enable_mobile_action_modeswitch" = xyes])
-+
-+if test "x$enable_keymap" = xyes; then
- 	AC_PATH_PROG([GPERF], [gperf])
- 	if test -z "$GPERF"; then
- 		AC_MSG_ERROR([gperf is needed])
- 	fi
- 
-+	AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
-+	AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
-+fi
-+
-+if test "x$enable_gudev" = xyes -o "x$enable_acl" = xyes; then
- 	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0])
- 	AC_SUBST([GLIB_CFLAGS])
- 	AC_SUBST([GLIB_LIBS])
-+fi
- 
-+if test "x$enable_acl" = xyes; then
- 	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]))
-+fi
- 
-+if test "x$enable_bluetooth" = xyes -o "x$enable_mobile_action_modeswitch" = xyes; then
- 	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
- 	AC_SUBST(LIBUSB_CFLAGS)
- 	AC_SUBST(LIBUSB_LIBS)
-+fi
- 
-+if test "x$enable_usbdb" = xyes; then
- 	PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
- 	AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
-+fi
- 
-+if test "x$enable_pcidb" = xyes; then
- 	if test "x$cross_compiling" = "xno" ; then
- 		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])
-@@ -112,11 +151,9 @@ if test "x$enable_extras" = xyes; then
- 	AC_MSG_CHECKING([for PCI database location])
- 	AC_MSG_RESULT([$PCI_DATABASE])
- 	AC_SUBST(PCI_DATABASE)
--
--	AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
--	AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
-+else
-+	PCI_DATABASE=no
- fi
--AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
- 
- AC_ARG_ENABLE([introspection],
- 	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
-@@ -175,7 +212,11 @@ AC_MSG_RESULT([
- 	cflags:			${CFLAGS}
- 	ldflags:		${LDFLAGS}
- 
--	extras:			${enable_extras}
-+	gudev:			${enable_gudev}
-+	bluetooth:		${enable_bluetooth}
-+	keymap:			${enable_keymap}
-+	acl:			${enable_acl}
-+	mobile-action-modeswitch:	${enable_mobile_action_modeswitch}
- 	gintrospection:		${enable_introspection}
- 
- 	usb.ids:		${USB_DATABASE}
diff --git a/patches/udev-167/autogen.sh b/patches/udev-167/autogen.sh
deleted file mode 120000
index 9f8a4cb7d..000000000
--- a/patches/udev-167/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/udev-167/series b/patches/udev-167/series
deleted file mode 100644
index 9cb0570d2..000000000
--- a/patches/udev-167/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# generated by git-ptx-patches
-0001-split-enabling-extras-with-dependencies.patch
-# d28b0e9be2869fd1f765862172a30ed1  - git-ptx-patches magic
diff --git a/rules/udev.in b/rules/udev.in
index b121dc25a..542f236f2 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -8,7 +8,6 @@ menuconfig UDEV
 	select GLIB		if UDEV_EXTRA_UDEV_ACL
 	select ACL		if UDEV_EXTRA_UDEV_ACL
 	select USBUTILS		if UDEV_EXTRA_USB_DB
-	select LIBUSB_COMPAT	if UDEV_EXTRA_HID2HCI
 	select LIBUSB_COMPAT	if UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
 	select PCIUTILS		if UDEV_EXTRA_PCI_DB
 	help
@@ -187,12 +186,6 @@ if UDEV_EXTRAS
 		help
 		  Find matching entry in fstab and export it
 
-	config UDEV_EXTRA_HID2HCI
-		bool
-		prompt "hid2hci"
-		help
-		  Convert HID to HCI IDs
-
 	config UDEV_EXTRA_INPUT_ID
 		bool
 		prompt "input_id"
diff --git a/rules/udev.make b/rules/udev.make
index 04ca800ff..f4932a329 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -20,8 +20,8 @@ ifndef PTXCONF_UDEV_EXPERIMENTAL
 UDEV_VERSION	:= 162
 UDEV_MD5	:= dd7099242e92084605e07db0c7299a02
 else
-UDEV_VERSION	:= 167
-UDEV_MD5	:= 4b37e1222f06c14c24147de346aa0bad
+UDEV_VERSION	:= 170
+UDEV_MD5	:= 6e132d1a3b4dae24dafd2726c5cdd982
 endif
 UDEV		:= udev-$(UDEV_VERSION)
 UDEV_SUFFIX	:= tar.bz2
@@ -81,12 +81,6 @@ else
 UDEV_AUTOCONF	+= --without-systemdsystemunitdir
 endif
 
-ifeq ($(PTXCONF_ARCH_ARM)-$(PTXCONF_UDEV_EXTRA_HID2HCI),-y)
-UDEV_AUTOCONF	+= --enable-bluetooth
-else
-UDEV_AUTOCONF	+= --disable-bluetooth
-endif
-
 ifdef PTXCONF_UDEV_EXTRA_KEYMAP
 UDEV_AUTOCONF	+= --enable-keymap
 else
@@ -94,27 +88,21 @@ UDEV_AUTOCONF	+= --disable-keymap
 endif
 
 ifdef PTXCONF_UDEV_EXTRA_UDEV_ACL
-UDEV_AUTOCONF	+= --enable-acl
-else
-UDEV_AUTOCONF	+= --disable-acl
-endif
-
-ifdef PTXCONF_UDEV_EXTRA_USB_DB
-UDEV_AUTOCONF	+= --enable-usbdb
+UDEV_AUTOCONF	+= --enable-udev_acl
 else
-UDEV_AUTOCONF	+= --disable-usbdb
+UDEV_AUTOCONF	+= --disable-udev_acl
 endif
 
-ifdef PTXCONF_UDEV_EXTRA_PCI_DB
-UDEV_AUTOCONF	+= --enable-pcidb
+ifneq ($(PTXCONF_UDEV_EXTRA_USB_DB)$(PTXCONF_UDEV_EXTRA_PCI_DB),)
+UDEV_AUTOCONF	+= --enable-hwdb
 else
-UDEV_AUTOCONF	+= --disable-pcidb
+UDEV_AUTOCONF	+= --disable-hwdb
 endif
 
 ifdef PTXCONF_UDEV_EXTRA_MOBILE_ACTION_MODESWITCH
-UDEV_AUTOCONF	+= --enable-mobile-action-modeswitch
+UDEV_AUTOCONF	+= --enable-action_modeswitch
 else
-UDEV_AUTOCONF	+= --disable-mobile-action-modeswitch
+UDEV_AUTOCONF	+= --disable-action_modeswitch
 endif
 
 ifdef PTXCONF_UDEV_SELINUX