[udev] version bump 140 -> 150

Based on a patch from Carsten Schlote <c.schlote@konzeptpark.de>

* Lots of changes in the config options.
* A patch to split "--disable-extras" to avoid unnecessary dependencies
* Patches to work with older toolchains.
* rename UDEV__ -> UDEV_ and add migrate pattern

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

12 files changed, 900 insertions, 104 deletions

diff --git a/patches/udev-150/autogen.sh b/patches/udev-150/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/udev-150/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/udev-150/series b/patches/udev-150/series
new file mode 100644
index 000000000..015c52cac
--- /dev/null
+++ b/patches/udev-150/series
@@ -0,0 +1,5 @@
+udev-150-split-extras.diff
+udev-150-revert-SOCK_CLOEXEC.diff
+udev-150-revert-bsg_h-removal.diff
+udev-150-remove-le16toh.diff
+udev-150-fix-ppc-build.diff
diff --git a/patches/udev-150/udev-150-fix-ppc-build.diff b/patches/udev-150/udev-150-fix-ppc-build.diff
new file mode 100644
index 000000000..62804fdac
--- /dev/null
+++ b/patches/udev-150/udev-150-fix-ppc-build.diff
@@ -0,0 +1,23 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: add missing #include <linux/types.h>
+
+Without "#include <linux/types.h>" __u32 is undefined in linux/hiddev.h on PPC
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ extras/hid2hci/hid2hci.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: b/extras/hid2hci/hid2hci.c
+===================================================================
+--- a/extras/hid2hci/hid2hci.c
++++ b/extras/hid2hci/hid2hci.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <getopt.h>
+ #include <sys/ioctl.h>
++#include <linux/types.h>
+ #include <linux/hiddev.h>
+ #include <usb.h>
+ 
diff --git a/patches/udev-150/udev-150-remove-le16toh.diff b/patches/udev-150/udev-150-remove-le16toh.diff
new file mode 100644
index 000000000..7794bcf1b
--- /dev/null
+++ b/patches/udev-150/udev-150-remove-le16toh.diff
@@ -0,0 +1,30 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: HACK: remove le16toh usage
+
+le16toh is not supported by OSELAS.Toolchain-1.99.3
+
+Not for upstream.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ extras/ata_id/ata_id.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+Index: b/extras/ata_id/ata_id.c
+===================================================================
+--- a/extras/ata_id/ata_id.c
++++ b/extras/ata_id/ata_id.c
+@@ -168,7 +168,11 @@ static void disk_identify_fixup_uint16 (
+ 	uint16_t *p;
+ 
+ 	p = (uint16_t *) identify;
+-	p[offset_words] = le16toh (p[offset_words]);
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++	p[offset_words] = p[offset_words];
++#else
++	p[offset_words] = __bswap_16 (p[offset_words]);
++#endif
+ }
+ 
+ /**
diff --git a/patches/udev-150/udev-150-revert-SOCK_CLOEXEC.diff b/patches/udev-150/udev-150-revert-SOCK_CLOEXEC.diff
new file mode 100644
index 000000000..417a0ee12
--- /dev/null
+++ b/patches/udev-150/udev-150-revert-SOCK_CLOEXEC.diff
@@ -0,0 +1,121 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: HACK: revert 26347a4c5538008318188118872490128f43fcd3 (don't use SOCK_CLOEXEC)
+
+SOCK_CLOEXEC is not defined by the glibc in OSELAS.Toolchain-1.99.3
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+diff --git a/libudev/libudev-monitor.c b/libudev/libudev-monitor.c
+index 96c153f..ee855af 100644
+--- a/libudev/libudev-monitor.c
++++ b/libudev/libudev-monitor.c
+@@ -139,12 +139,13 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
+ 		util_strscpy(&udev_monitor->sun.sun_path[1], sizeof(udev_monitor->sun.sun_path)-1, socket_path);
+ 		udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path)+1;
+ 	}
+-	udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0);
++	udev_monitor->sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
+ 	if (udev_monitor->sock == -1) {
+ 		err(udev, "error getting socket: %m\n");
+ 		free(udev_monitor);
+ 		return NULL;
+ 	}
++	util_set_fd_cloexec(udev_monitor->sock);
+ 
+ 	dbg(udev, "monitor %p created with '%s'\n", udev_monitor, socket_path);
+ 	return udev_monitor;
+@@ -196,12 +197,13 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev, const char
+ 	if (udev_monitor == NULL)
+ 		return NULL;
+ 
+-	udev_monitor->sock = socket(PF_NETLINK, SOCK_DGRAM|SOCK_CLOEXEC, NETLINK_KOBJECT_UEVENT);
++	udev_monitor->sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
+ 	if (udev_monitor->sock == -1) {
+ 		err(udev, "error getting socket: %m\n");
+ 		free(udev_monitor);
+ 		return NULL;
+ 	}
++	util_set_fd_cloexec(udev_monitor->sock);
+ 
+ 	udev_monitor->snl.nl_family = AF_NETLINK;
+ 	udev_monitor->snl.nl_groups = group;
+diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
+index c2fff00..6738a9b 100644
+--- a/libudev/libudev-private.h
++++ b/libudev/libudev-private.h
+@@ -204,6 +204,7 @@ size_t util_strscpyl(char *dest, size_t size, const char *src, ...) __attribute_
+ int udev_util_replace_whitespace(const char *str, char *to, size_t len);
+ int udev_util_replace_chars(char *str, const char *white);
+ int udev_util_encode_string(const char *str, char *str_enc, size_t len);
++void util_set_fd_cloexec(int fd);
+ unsigned int util_string_hash32(const char *str);
+ 
+ /* libudev-util-private.c */
+diff --git a/libudev/libudev-util.c b/libudev/libudev-util.c
+index c0209f9..9a656b5 100644
+--- a/libudev/libudev-util.c
++++ b/libudev/libudev-util.c
+@@ -481,6 +481,18 @@ err:
+ 	return -1;
+ }
+ 
++void util_set_fd_cloexec(int fd)
++{
++	int flags;
++
++	flags = fcntl(fd, F_GETFD);
++	if (flags < 0)
++		flags = FD_CLOEXEC;
++	else
++		flags |= FD_CLOEXEC;
++	fcntl(fd, F_SETFD, flags);
++}
++
+ unsigned int util_string_hash32(const char *str)
+ {
+ 	unsigned int hash = 0;
+diff --git a/udev/udev-watch.c b/udev/udev-watch.c
+index d67083b..102e16f 100644
+--- a/udev/udev-watch.c
++++ b/udev/udev-watch.c
+@@ -38,8 +38,10 @@ static int inotify_fd = -1;
+  */
+ int udev_watch_init(struct udev *udev)
+ {
+-	inotify_fd = inotify_init1(IN_CLOEXEC);
+-	if (inotify_fd < 0)
++	inotify_fd = inotify_init();
++	if (inotify_fd >= 0)
++		util_set_fd_cloexec(inotify_fd);
++	else
+ 		err(udev, "inotify_init failed: %m\n");
+ 	return inotify_fd;
+ }
+diff --git a/udev/udevd.c b/udev/udevd.c
+index fe3352c..86936c7 100644
+--- a/udev/udevd.c
++++ b/udev/udevd.c
+@@ -223,6 +223,7 @@ static void worker_new(struct event *event)
+ 	/* allow the main daemon netlink address to send devices to the worker */
+ 	udev_monitor_allow_unicast_sender(worker_monitor, monitor);
+ 	udev_monitor_enable_receiving(worker_monitor);
++	util_set_fd_cloexec(udev_monitor_get_fd(worker_monitor));
+ 
+ 	worker = calloc(1, sizeof(struct worker));
+ 	if (worker == NULL)
+@@ -922,13 +923,14 @@ int main(int argc, char *argv[])
+ 	}
+ 
+ 	/* unnamed socket from workers to the main daemon */
+-	if (socketpair(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0, worker_watch) < 0) {
++	if (socketpair(AF_LOCAL, SOCK_DGRAM, 0, worker_watch) < 0) {
+ 		fprintf(stderr, "error getting socketpair\n");
+ 		err(udev, "error getting socketpair\n");
+ 		rc = 6;
+ 		goto exit;
+ 	}
+ 	pfd[FD_WORKER].fd = worker_watch[READ_END];
++	util_set_fd_cloexec(worker_watch[WRITE_END]);
+ 
+ 	rules = udev_rules_new(udev, resolve_names);
+ 	if (rules == NULL) {
diff --git a/patches/udev-150/udev-150-revert-bsg_h-removal.diff b/patches/udev-150/udev-150-revert-bsg_h-removal.diff
new file mode 100644
index 000000000..f6e57a9d5
--- /dev/null
+++ b/patches/udev-150/udev-150-revert-bsg_h-removal.diff
@@ -0,0 +1,125 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: HACK: revert 24355313dc9686a14a618fcd9bbdedc29c57b651 (readd bsg.h)
+
+Readd bsg.h which is not part of the kernel headers in OSELAS.Toolchain-1.99.3
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+diff --git a/Makefile.am b/Makefile.am
+index b7ced1d..67cff09 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -268,7 +268,8 @@ extras_scsi_id_scsi_id_SOURCES =\
+ 	extras/scsi_id/scsi_id.c \
+ 	extras/scsi_id/scsi_serial.c \
+ 	extras/scsi_id/scsi.h \
+-	extras/scsi_id/scsi_id.h
++	extras/scsi_id/scsi_id.h \
++	extras/scsi_id/bsg.h
+ extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
+ libexec_PROGRAMS += extras/scsi_id/scsi_id
+ dist_man_MANS += extras/scsi_id/scsi_id.8
+diff --git a/extras/scsi_id/bsg.h b/extras/scsi_id/bsg.h
+new file mode 100644
+index 0000000..cf0303a
+--- /dev/null
++++ b/extras/scsi_id/bsg.h
+@@ -0,0 +1,84 @@
++#ifndef BSG_H
++#define BSG_H
++
++#define BSG_PROTOCOL_SCSI		0
++
++#define BSG_SUB_PROTOCOL_SCSI_CMD	0
++#define BSG_SUB_PROTOCOL_SCSI_TMF	1
++#define BSG_SUB_PROTOCOL_SCSI_TRANSPORT	2
++
++struct sg_io_v4 {
++	__s32 guard;		/* [i] 'Q' to differentiate from v3 */
++	__u32 protocol;		/* [i] 0 -> SCSI , .... */
++	__u32 subprotocol;	/* [i] 0 -> SCSI command, 1 -> SCSI task
++				   management function, .... */
++
++	__u32 request_len;	/* [i] in bytes */
++	__u64 request;		/* [i], [*i] {SCSI: cdb} */
++	__u64 request_tag;	/* [i] {SCSI: task tag (only if flagged)} */
++	__u32 request_attr;	/* [i] {SCSI: task attribute} */
++	__u32 request_priority;	/* [i] {SCSI: task priority} */
++	__u32 request_extra;	/* [i] {spare, for padding} */
++	__u32 max_response_len;	/* [i] in bytes */
++	__u64 response;		/* [i], [*o] {SCSI: (auto)sense data} */
++
++        /* "dout_": data out (to device); "din_": data in (from device) */
++	__u32 dout_iovec_count;	/* [i] 0 -> "flat" dout transfer else
++				   dout_xfer points to array of iovec */
++	__u32 dout_xfer_len;	/* [i] bytes to be transferred to device */
++	__u32 din_iovec_count;	/* [i] 0 -> "flat" din transfer */
++	__u32 din_xfer_len;	/* [i] bytes to be transferred from device */
++	__u64 dout_xferp;	/* [i], [*i] */
++	__u64 din_xferp;	/* [i], [*o] */
++
++	__u32 timeout;		/* [i] units: millisecond */
++	__u32 flags;		/* [i] bit mask */
++	__u64 usr_ptr;		/* [i->o] unused internally */
++	__u32 spare_in;		/* [i] */
++
++	__u32 driver_status;	/* [o] 0 -> ok */
++	__u32 transport_status;	/* [o] 0 -> ok */
++	__u32 device_status;	/* [o] {SCSI: command completion status} */
++	__u32 retry_delay;	/* [o] {SCSI: status auxiliary information} */
++	__u32 info;		/* [o] additional information */
++	__u32 duration;		/* [o] time to complete, in milliseconds */
++	__u32 response_len;	/* [o] bytes of response actually written */
++	__s32 din_resid;	/* [o] din_xfer_len - actual_din_xfer_len */
++	__s32 dout_resid;	/* [o] dout_xfer_len - actual_dout_xfer_len */
++	__u64 generated_tag;	/* [o] {SCSI: transport generated task tag} */
++	__u32 spare_out;	/* [o] */
++
++	__u32 padding;
++};
++
++#ifdef __KERNEL__
++
++#if defined(CONFIG_BLK_DEV_BSG)
++struct bsg_class_device {
++	struct device *class_dev;
++	struct device *parent;
++	int minor;
++	struct request_queue *queue;
++	struct kref ref;
++	void (*release)(struct device *);
++};
++
++extern int bsg_register_queue(struct request_queue *q,
++			      struct device *parent, const char *name,
++			      void (*release)(struct device *));
++extern void bsg_unregister_queue(struct request_queue *);
++#else
++static inline int bsg_register_queue(struct request_queue *q,
++				     struct device *parent, const char *name,
++				     void (*release)(struct device *))
++{
++	return 0;
++}
++static inline void bsg_unregister_queue(struct request_queue *q)
++{
++}
++#endif
++
++#endif /* __KERNEL__ */
++
++#endif
+diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
+index 0c9d9c3..65b3de5 100644
+--- a/extras/scsi_id/scsi_serial.c
++++ b/extras/scsi_id/scsi_serial.c
+@@ -29,7 +29,8 @@
+ #include <scsi/scsi.h>
+ #include <scsi/sg.h>
+ #include <linux/types.h>
+-#include <linux/bsg.h>
++/* #include <linux/bsg.h> */
++#include "bsg.h"
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
diff --git a/patches/udev-150/udev-150-split-extras.diff b/patches/udev-150/udev-150-split-extras.diff
new file mode 100644
index 000000000..de1dff0ae
--- /dev/null
+++ b/patches/udev-150/udev-150-split-extras.diff
@@ -0,0 +1,222 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: 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  |   25 +++++++++++++++++++++----
+ configure.ac |   59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 69 insertions(+), 15 deletions(-)
+
+Index: b/Makefile.am
+===================================================================
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -288,7 +288,8 @@ 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
+ 
+-if ENABLE_EXTRAS
++if ENABLE_USBDB
++if ENABLE_PCIDB
+ # ------------------------------------------------------------------------------
+ # conditional extras (need glib, libusb, libacl, ...)
+ # ------------------------------------------------------------------------------
+@@ -296,7 +297,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
+ # ------------------------------------------------------------------------------
+@@ -334,7 +340,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) \
+@@ -410,7 +416,9 @@ typelibs_DATA = extras/gudev/GUdev-1.0.t
+ 
+ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+ endif # ENABLE_INTROSPECTION
++endif # ENABLE_GUDEV
+ 
++if ENABLE_BLUETOOTH
+ # ------------------------------------------------------------------------------
+ # Bluetooth HID devices with special magic to switch the device
+ # ------------------------------------------------------------------------------
+@@ -419,7 +427,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
+ # ------------------------------------------------------------------------------
+@@ -434,7 +444,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
+ # ------------------------------------------------------------------------------
+@@ -442,7 +454,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
+ # ------------------------------------------------------------------------------
+@@ -450,7 +464,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_MODEM_MODESWITCH
+ # ------------------------------------------------------------------------------
+ # modem-modeswitch - magic config switch for 3G modems
+ # ------------------------------------------------------------------------------
+@@ -470,7 +486,9 @@ dist_udevrules_DATA += \
+ 	extras/modem-modeswitch/61-mobile-action.rules
+ 
+ libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
++endif # ENABLE_MODEM_MODESWITCH
+ 
++if ENABLE_KEYMAP
+ # ------------------------------------------------------------------------------
+ # keymap - map custom hardware's multimedia keys
+ # ------------------------------------------------------------------------------
+@@ -562,8 +580,7 @@ extras/keymap/keys-to-name.h: extras/key
+ keymaps-distcheck-hook: extras/keymap/keys.txt
+ 	$(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
+@@ -46,32 +46,70 @@ if test "x$enable_logging" = "xyes"; the
+ 	AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
+ fi
+ 
+-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([modem-modeswitch],
++	AS_HELP_STRING([--disable-modem-modeswitch], [disable modem-modeswitch - magic config switch for 3G modems]),
++	[], [enable_modem_modeswitch=yes])
++AM_CONDITIONAL([ENABLE_MODEM_MODESWITCH], [test "x$enable_modem_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
++fi
+ 
++if test "x$enable_gudev" = xyes -o "x$enable_acl" = xyes; then
+ 	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
+ 	AC_SUBST([GLIB_CFLAGS])
+ 	AC_SUBST([GLIB_LIBS])
++fi
+ 
+-	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]))
+-
++if test "x$enable_bluetooth" = xyes -o "x$enable_modem_modeswitch" = xyes; then
+ 	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
+ 	AC_SUBST(LIBUSB_CFLAGS)
+ 	AC_SUBST(LIBUSB_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_usbdb" = xyes; then
+ 	PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
+ 	AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
++fi
+ 
+-	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])
++if test "x$enable_pcidb" = xyes; then
++	if test "x$cross_compiling" != xyes; 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])
++		AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
++	fi
+ 	AC_ARG_WITH(pci-ids-path,
+ 		AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
+ 		[PCI_DATABASE=${withval}],
+@@ -82,7 +120,6 @@ if test "x$enable_extras" = xyes; then
+ 		fi])
+ 	AC_SUBST(PCI_DATABASE)
+ fi
+-AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
+ 
+ AC_ARG_ENABLE([introspection],
+ 	AS_HELP_STRING([--disable-introspection], [disable GObject introspection]),
diff --git a/rules/connman.in b/rules/connman.in
index 54eb1916c..546ac5255 100644
--- a/rules/connman.in
+++ b/rules/connman.in
@@ -98,7 +98,7 @@ menu "plugins"
 
 	config CONNMAN_UDEV
 		bool
-		select UDEV__LIBUDEV
+		select UDEV_LIBUDEV
 		prompt "udev support"
 
 endmenu
diff --git a/rules/devicekit.in b/rules/devicekit.in
index 7a891b24c..daa4a96fb 100644
--- a/rules/devicekit.in
+++ b/rules/devicekit.in
@@ -6,7 +6,7 @@ config DEVICEKIT
 	select DBUS
 	select DBUS_GLIB
 	select UDEV
-	select UDEV__LIBUDEV
+	select UDEV_LIBUDEV
 	prompt "devicekit"
 	help
 	  FIXME
diff --git a/rules/udev.in b/rules/udev.in
index 58db64298..c26977a55 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -3,6 +3,14 @@ menuconfig UDEV
 	tristate
 	prompt "udev                          "
 	select ROOTFS_DEV
+	select HOST_GPERF	if UDEV_EXTRA_KEYMAP
+	select GLIB		if UDEV_LIBGUDEV
+	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_MODEM_MODESWITCH
+	select PCIUTILS		if UDEV_EXTRA_PCI_DB
 	help
 	  udev provides a dynamic device directory containing only the files for
 	  actually present devices. It creates or removes device node files in the
@@ -24,7 +32,7 @@ if UDEV
 
 menu "build options                 "
 
-	config UDEV__DEBUG
+	config UDEV_DEBUG
 		bool
 		prompt "enable debug messages"
 		help
@@ -32,12 +40,12 @@ menu "build options                 "
 		  into the udev binaries. The actual level of debugging is specified
 		  in the udev config file (refer entry "udev_log")
 
-	config UDEV__SELINUX
+	config UDEV_SELINUX
 		bool
 		# not supported yet
 		# prompt "enable selinux support"
 
-	config UDEV__SYSLOG
+	config UDEV_SYSLOG
 		bool
 		prompt "syslog support"
 		help
@@ -47,135 +55,226 @@ menu "build options                 "
 
 endmenu
 
-menu "extras                        "
+menu "install options               "
+
+	config UDEV_ETC_CONF
+		bool
+		default y
+		prompt "install udev.conf"
+		help
+		  Installs /etc/udev/udev.conf. If you don't wish to install the
+		  generic udev.conf, just put a copy of your own udev.conf file into
+		  your own projectroot/etc/udev/
+
+	config UDEV_DEFAULT_RULES
+		bool
+		prompt "install default udev rules"
+		help
+		  This will install the generic udev rules files from the udev package
+		  under /lib/udev/rules.d/, except of rules to automatically load
+		  drivers modules.
+
+	config UDEV_DEFAULT_DRIVERS_RULES
+		bool
+		prompt "install default udev driver rules"
+		help
+		  This will install the generic udev drivers rules files from the udev package
+		  under /lib/udev/rules.d/,
+		  These rules are required to automatically load kernel modules on
+		  udev start.
+		  If unsure say Y.
+
+	config UDEV_DEFAULT_KEYMAPS
+		bool
+		prompt "install default keymaps"
+		help
+	  	  This will install some of the common keymaps shipped by udev.
+
+	config UDEV_COMMON_RULES
+		bool
+		prompt "install common udev rules"
+		help
+	  	  This will install some of the common rules shipped by udev, including
+		  rules for sound, isdn, md and device mapper.
+
+	config UDEV_CUST_RULES
+		bool
+		prompt "install customized udev rules"
+		help
+		  This will install the customized udev rules files from
+		  projectroot/lib/udev/rules.d into /lib/udev/rules.d
+
+	config UDEV_LIBUDEV
+		bool
+		prompt "install libudev"
+		help
+		  Install libudev.so on the target.
+
+	config UDEV_LIBGUDEV
+		bool
+		prompt "install libgudev"
+		help
+		  Install libgudev.so on the target.
 
-	config UDEV__EXTRA_ATA_ID
+	config UDEV_STARTSCRIPT
+		bool
+		default y
+		prompt "install /etc/init.d/udev or /etc/init/udev.conf"
+		help
+		  Install the startup magic for either bbinit or upstart.
+		  Select Y here, as this is what you usually want.
+
+endmenu
+
+menuconfig UDEV_EXTRAS
+	bool "extras                        "
+
+if UDEV_EXTRAS
+
+	config UDEV_EXTRA_ATA_ID
 		bool
 		prompt "ata_id"
 		help
 		  udev callout to read product/serial number from ATA drives
 
-	config UDEV__EXTRA_CDROM_ID
+	config UDEV_EXTRA_CDROM_ID
 		bool
 		prompt "cdrom_id"
 		help
 		  udev callout to determine the capabilities of optical drives and media
 
-	config UDEV__EXTRA_COLLECT
+	config UDEV_EXTRA_COLLECT
 		bool
 		prompt "collect"
 		help
 		  Collect variables across events
 
-	config UDEV__EXTRA_EDD_ID
+	config UDEV_EXTRA_EDD_ID
 		bool
 		prompt "edd_id"
 		help
-		  FIXME
+		  Tool to get EDD ID
+
+	config UDEV_EXTRA_FINDKEYBOARDS
+		bool
+		prompt "findkeyboards"
+		help
+		  Tool to find attached keyboards
 
-	config UDEV__EXTRA_FIRMWARE
+	config UDEV_EXTRA_FIRMWARE
 		bool
 		prompt "firmware"
 		help
-	  	  This is a small helper script to load some kind of firmware on demand
+	  	  This is a small helper binary to load some kind of firmware on demand
 
-	config UDEV__EXTRA_FLOPPY
+	config UDEV_EXTRA_FLOPPY
 		bool
-		prompt "floppy"
+		prompt "create_floppy_devices"
 		help
 		  FIXME
 
-	config UDEV__EXTRA_FSTAB_IMPORT
+	config UDEV_EXTRA_FSTAB_IMPORT
 		bool
 		prompt "fstab_import"
 		help
 		  Find matching entry in fstab and export it
 
-	config UDEV__EXTRA_PATH_ID
+	config UDEV_EXTRA_HID2HCI
 		bool
-		prompt "path_id"
+		prompt "hid2hci"
 		help
-		  udev callout to create a device path based unique name for a device to
-		  implement the Linux Persistent Device Naming scheme
+		  Convert HID to HCI IDs
 
-	config UDEV__EXTRA_RULE_GENERATOR
+	config UDEV_EXTRA_INPUT_ID
 		bool
-		prompt "rule_generator"
+		prompt "input_id"
 		help
 		  FIXME
 
-	config UDEV__EXTRA_SCSI_ID
+	config UDEV_EXTRA_KEYBOARD_FORCE_RELEASE
 		bool
-		prompt "scsi_id"
+		prompt "keyboard-force-release.sh"
 		help
-		  Used to build unique IDs for an SCSI media to identify it again
+		  Keyboard support
 
-	config UDEV__EXTRA_USB_ID
+	config UDEV_EXTRA_KEYMAP
 		bool
-		prompt "usb_id"
+		prompt "keymap"
 		help
-		    This is a helper to generate unique information about some kind of
-		    USB device. This is required to ensure the same hotplugged device to
-		    appear always at the same device node (via link)
+		  Keymap support
 
-	config UDEV__EXTRA_VOLUME_ID
+	config UDEV_EXTRA_MODEM_MODESWITCH
 		bool
-		prompt "volume_id"
+		prompt "modem-modeswitch"
 		help
-		  FIXME
+		  Option UMTS Modem support
 
-endmenu
+	config UDEV_EXTRA_PATH_ID
+		bool
+		prompt "path_id"
+		help
+		  udev callout to create a device path based unique name for a device to
+		  implement the Linux Persistent Device Naming scheme
 
-menu "install options               "
+	config UDEV_EXTRA_PCI_DB
+		bool
+		prompt "pci-db"
+		help
+		  Name resolution for PCI IDs
 
-	config UDEV__INSTALL_TEST_UDEV
+	config UDEV_EXTRA_RULE_GENERATOR
 		bool
-		prompt "install test-udev"
+		prompt "rule_generator"
 		help
 		  FIXME
 
-	config UDEV__ETC_CONF
+	config UDEV_EXTRA_SCSI_ID
 		bool
-		default y
-		prompt "install udev.conf"
+		prompt "scsi_id"
 		help
-		  Installs /etc/udev/udev.conf. If you don't wish to install the
-		  generic udev.conf, just put a copy of your own udev.conf file into
-		  your own projectroot/etc/udev/ 
+		  Used to build unique IDs for an SCSI media to identify it again
 
-	config UDEV__DEFAULT_RULES
+	config UDEV_EXTRA_UDEV_ACL
 		bool
-		prompt "install default udev rules"
+		prompt "udev-acl"
 		help
-		  This will install the generic udev rules files from the udev package
-		  under /lib/udev/rules.d/
+		  FIXME
 
-	config UDEV__COMMON_RULES
+	config UDEV_EXTRA_USB_DB
 		bool
-		prompt "install common udev rules"
+		prompt "usb-db"
 		help
-	  	  This will install some of the common rules shipped by udev, including
-		  rules for sound, isdn, md and device mapper.
+		  Name resolution for USB IDs
 
-	config UDEV__CUST_RULES
+	config UDEV_EXTRA_USB_ID
 		bool
-		prompt "install customized udev rules"
+		prompt "usb_id"
 		help
-		  This will install the customized udev rules files from
-		  projectroot/lib/udev/rules.d into /lib/udev/rules.d
+		    This is a helper to generate unique information about some kind of
+		    USB device. This is required to ensure the same hotplugged device to
+		    appear always at the same device node (via link)
 
-	config UDEV__LIBUDEV
+	config UDEV_EXTRA_V4L_ID
 		bool
-		prompt "install libudev"
+		prompt "v4l_id"
 		help
-		  Install libudev.so on the target.
+		  FIXME
 
-	config UDEV_STARTSCRIPT
+	config UDEV_EXTRA_WRITE_CD_RULES
 		bool
-		default y
-		prompt "install /etc/init.d/udev"
+		prompt "write_cd_rules"
+		help
+		  This will generate udev-based persistent naming rules for your CD/DVD media
 
-	endmenu
+	config UDEV_EXTRA_WRITE_NET_RULES
+		bool
+		prompt "write_net_rules"
+		help
+		  This will generate udev-based persistent naming rules for your network devices
+
+endif
 
 endif
 
+
+
diff --git a/rules/udev.make b/rules/udev.make
index 64f200781..3ab935e91 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_UDEV) += udev
 #
 # Paths and names
 #
-UDEV_VERSION	:= 140
+UDEV_VERSION	:= 150
 UDEV		:= udev-$(UDEV_VERSION)
 UDEV_SUFFIX	:= tar.bz2
 UDEV_SOURCE	:= $(SRCDIR)/$(UDEV).$(UDEV_SUFFIX)
@@ -39,30 +39,78 @@ $(UDEV_SOURCE):
 # Prepare
 # ----------------------------------------------------------------------------
 
-UDEV_PATH	:= PATH=$(CROSS_PATH)
-UDEV_ENV 	:= $(CROSS_ENV)
-
 #
 # autoconf
 #
 UDEV_AUTOCONF := \
 	$(CROSS_AUTOCONF_ROOT) \
+	--libexecdir=/lib/udev \
+	\
 	--disable-dependency-tracking \
+	--disable-introspection \
 	--enable-shared
 
-ifdef PTXCONF_UDEV__DEBUG
+ifdef PTXCONF_PCIUTILS_COMPRESS
+UDEV_AUTOCONF += --with-pci-ids-path=/usr/share/pci.ids.gz
+else
+UDEV_AUTOCONF += --with-pci-ids-path=/usr/share/pci.ids
+endif
+
+ifdef PTXCONF_UDEV_DEBUG
 UDEV_AUTOCONF	+= --enable-debug
 else
 UDEV_AUTOCONF	+= --disable-debug
 endif
 
-ifdef PTXCONF_UDEV__SELINUX
+ifdef PTXCONF_UDEV_LIBGUDEV
+UDEV_AUTOCONF	+= --enable-gudev
+else
+UDEV_AUTOCONF	+= --disable-gudev
+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
+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
+else
+UDEV_AUTOCONF	+= --disable-usbdb
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_PCI_DB
+UDEV_AUTOCONF	+= --enable-pcidb
+else
+UDEV_AUTOCONF	+= --disable-pcidb
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_MODEM_MODESWITCH
+UDEV_AUTOCONF	+= --enable-modem-modeswitch
+else
+UDEV_AUTOCONF	+= --disable-modem-modeswitch
+endif
+
+ifdef PTXCONF_UDEV_SELINUX
 UDEV_AUTOCONF	+= --with-selinux
 else
 UDEV_AUTOCONF	+= --without-selinux
 endif
 
-ifdef PTXCONF_UDEV__SYSLOG
+ifdef PTXCONF_UDEV_SYSLOG
 UDEV_AUTOCONF	+= --enable-logging
 else
 UDEV_AUTOCONF	+= --disable-logging
@@ -90,16 +138,13 @@ $(STATEDIR)/udev.targetinstall:
 
 	@$(call install_copy, udev, 0, 0, 0755, -, /sbin/udevd)
 	@$(call install_copy, udev, 0, 0, 0755, -, /sbin/udevadm)
-ifdef PTXCONF_UDEV__INSTALL_TEST_UDEV
-	@$(call install_copy, udev, 0, 0, 0755, $(UDEV_DIR)/udev/test-udev, \
-		/sbin/test-udev)
-endif
 
 #	#
 #	# default rules
 #	#
+
 # install everything apart of drivers rule.
-ifdef PTXCONF_UDEV__DEFAULT_RULES
+ifdef PTXCONF_UDEV_DEFAULT_RULES
 	@cd $(UDEV_DIR)/rules/rules.d; \
 	for file in `find . -type f ! -name "*drivers*"`; do \
 		$(call install_copy, udev, 0, 0, 0644, \
@@ -108,17 +153,52 @@ ifdef PTXCONF_UDEV__DEFAULT_RULES
 	done
 endif
 
-ifdef PTXCONF_UDEV__COMMON_RULES
+# install drivers rules.
+ifdef PTXCONF_UDEV_DEFAULT_DRIVERS_RULES
+	@cd $(UDEV_DIR)/rules/rules.d; \
+	for file in `find . -type f -name "*drivers*"`; do \
+		$(call install_copy, udev, 0, 0, 0644, \
+			$(UDEV_DIR)/rules/rules.d/$$file, \
+			/lib/udev/rules.d/$$file, n); \
+	done
+endif
+
+# install default keymaps.
+ifdef PTXCONF_UDEV_DEFAULT_KEYMAPS
+	@cd $(UDEV_PKGDIR)/lib/udev/keymaps; \
+	for file in `find . -type f`; do \
+		$(call install_copy, udev, 0, 0, 0644, \
+			$(UDEV_PKGDIR)/lib/udev/keymaps/$$file, \
+			/lib/udev/keymaps/$$file, n); \
+	done
+endif
+
+ifdef PTXCONF_UDEV_COMMON_RULES
 #
 # these rules are not installed by default
 #
 	@$(call install_copy, udev, 0, 0, 0644, \
-		$(UDEV_DIR)/rules/packages/40-alsa.rules, \
-		/lib/udev/rules.d/40-alsa.rules, n);
-	@$(call install_copy, udev, 0, 0, 0644, \
 		$(UDEV_DIR)/rules/packages/40-isdn.rules, \
 		/lib/udev/rules.d/40-isdn.rules, n);
 	@$(call install_copy, udev, 0, 0, 0644, \
+		$(UDEV_DIR)/rules/packages/40-zaptel.rules, \
+		/lib/udev/rules.d/40-zaptel.rules, n);
+	@$(call install_copy, udev, 0, 0, 0644, \
+		$(UDEV_DIR)/rules/packages/40-s390.rules, \
+		/lib/udev/rules.d/40-s390.rules, n);
+	@$(call install_copy, udev, 0, 0, 0644, \
+		$(UDEV_DIR)/rules/packages/40-pilot-links.rules, \
+		/lib/udev/rules.d/40-pilot-links.rules, n);
+	@$(call install_copy, udev, 0, 0, 0644, \
+		$(UDEV_DIR)/rules/packages/40-ppc.rules, \
+		/lib/udev/rules.d/40-ppc.rules, n);
+	@$(call install_copy, udev, 0, 0, 0644, \
+		$(UDEV_DIR)/rules/packages/40-infiniband.rules, \
+		/lib/udev/rules.d/40-infiniband.rules, n);
+	@$(call install_copy, udev, 0, 0, 0644, \
+		$(UDEV_DIR)/rules/packages/40-ia64.rules, \
+		/lib/udev/rules.d/40-ia64.rules, n);
+	@$(call install_copy, udev, 0, 0, 0644, \
 		$(UDEV_DIR)/rules/packages/64-device-mapper.rules, \
 		/lib/udev/rules.d/64-device-mapper.rules, n);
 	@$(call install_copy, udev, 0, 0, 0644, \
@@ -126,7 +206,7 @@ ifdef PTXCONF_UDEV__COMMON_RULES
 		/lib/udev/rules.d/64-md-raid.rules, n);
 endif
 
-ifdef PTXCONF_UDEV__CUST_RULES
+ifdef PTXCONF_UDEV_CUST_RULES
 	@if [ -d $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/ ]; then \
 		cd $(PTXDIST_WORKSPACE)/projectroot/lib/udev/rules.d/; \
 		for file in `find . -type f`; do \
@@ -135,7 +215,7 @@ ifdef PTXCONF_UDEV__CUST_RULES
 				/lib/udev/rules.d/$$file, n); \
 		done; \
 	else \
-		echo "UDEV__CUST_RULES is enabled but Directory containing" \
+		echo "UDEV_CUST_RULES is enabled but Directory containing" \
 			"customized udev rules is missing!"; \
 		exit 1; \
 	fi
@@ -144,85 +224,167 @@ endif
 #	#
 #	# startup script
 #	#
-ifdef PTXCONF_INITMETHOD_BBINIT
 ifdef PTXCONF_UDEV_STARTSCRIPT
+ifdef PTXCONF_INITMETHOD_BBINIT
 	@$(call install_alternative, udev, 0, 0, 0755, /etc/init.d/udev)
 endif
+ifdef PTXCONF_INITMETHOD_UPSTART
+	@$(call install_alternative, udev, 0, 0, 0644, /etc/init/udev.conf)
+	@$(call install_alternative, udev, 0, 0, 0644, /etc/init/udevmonitor.conf)
+	@$(call install_alternative, udev, 0, 0, 0644, /etc/init/udevtrigger.conf)
+	@$(call install_alternative, udev, 0, 0, 0644, /etc/init/udev-finish.conf)
+endif
 endif
 
+
 #	#
 #	# Install a configuration on demand only
 #	#
-ifdef PTXCONF_UDEV__ETC_CONF
+ifdef PTXCONF_UDEV_ETC_CONF
 	@$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf)
 endif
 
 #	#
 #	# utilities from extra/
 #	#
-ifdef PTXCONF_UDEV__EXTRA_ATA_ID
+ifdef PTXCONF_UDEV_EXTRA_ATA_ID
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/ata_id)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_CDROM_ID
+ifdef PTXCONF_UDEV_EXTRA_CDROM_ID
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/cdrom_id)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/60-cdrom_id.rules,n)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/75-cd-aliases-generator.rules,n)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_COLLECT
+ifdef PTXCONF_UDEV_EXTRA_COLLECT
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/collect)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_EDD_ID
+ifdef PTXCONF_UDEV_EXTRA_EDD_ID
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/edd_id)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/61-persistent-storage-edd.rules,n)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_FINDKEYBOARDS
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/findkeyboards)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_FIRMWARE
-	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/firmware.sh, n)
+ifdef PTXCONF_UDEV_EXTRA_FIRMWARE
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/firmware)
 	@$(call install_copy, udev, 0, 0, 0644, -, \
 		/lib/udev/rules.d/50-firmware.rules,n)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_FLOPPY
+ifdef PTXCONF_UDEV_EXTRA_FLOPPY
 	@$(call install_copy, udev, 0, 0, 0755, -, \
 		/lib/udev/create_floppy_devices)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/60-floppy.rules)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_FSTAB_IMPORT
+ifdef PTXCONF_UDEV_EXTRA_FSTAB_IMPORT
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/fstab_import)
 	@$(call install_copy, udev, 0, 0, 0644, -, \
 		/lib/udev/rules.d/79-fstab_import.rules)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_PATH_ID
+ifndef PTXCONF_ARCH_ARM
+ifdef PTXCONF_UDEV_EXTRA_HID2HCI
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/hid2hci)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/70-hid2hci.rules,n)
+endif
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_INPUT_ID
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/input_id)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_KEYBOARD_FORCE_RELEASE
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/keyboard-force-release.sh, n)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/95-keyboard-force-release.rules,n)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_KEYMAP
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/keymap)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/95-keymap.rules,n)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_MODEM_MODESWITCH
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/modem-modeswitch)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/61-option-modem-modeswitch.rules,n)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/61-mobile-action.rules,n)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_PATH_ID
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/path_id)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_RULE_GENERATOR
+ifdef PTXCONF_UDEV_EXTRA_PCI_DB
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/pci-db)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_RULE_GENERATOR
 	@$(call install_copy, udev, 0, 0, 0755, -, \
 		/lib/udev/rule_generator.functions)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_SCSI_ID
-	@$(call install_copy, udev, 0, 0, 0644, -, /etc/scsi_id.config)
+ifdef PTXCONF_UDEV_EXTRA_SCSI_ID
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/scsi_id)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_USB_ID
+ifdef PTXCONF_UDEV_EXTRA_UDEV_ACL
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/udev-acl)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/70-acl.rules,n)
+	@$(call install_link, udev, ../../udev/udev-acl, \
+		/lib/ConsoleKit/run-seat.d/udev-acl.ck)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_USB_DB
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/usb-db)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_USB_ID
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/usb_id)
 endif
 
-ifdef PTXCONF_UDEV__EXTRA_VOLUME_ID
-	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/vol_id)
+ifdef PTXCONF_UDEV_EXTRA_V4L_ID
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/v4l_id)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/60-persistent-v4l.rules,n)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_WRITE_CD_RULES
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev//write_cd_rules)
+endif
+
+ifdef PTXCONF_UDEV_EXTRA_WRITE_NET_RULES
+	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev//write_net_rules)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/75-net-description.rules,n)
+	@$(call install_copy, udev, 0, 0, 0644, -, \
+		/lib/udev/rules.d/75-persistent-net-generator.rules,n)
+endif
 
-	@$(call install_copy, udev, 0, 0, 0644, -, /lib/libvolume_id.so.1.1.0)
-	@$(call install_link, udev, libvolume_id.so.1.1.0, /lib/libvolume_id.so.1)
-	@$(call install_link, udev, libvolume_id.so.1.1.0, /lib/libvolume_id.so)
+ifdef PTXCONF_UDEV_LIBUDEV
+	@$(call install_copy, udev, 0, 0, 0644, -, /lib/libudev.so.0.6.0)
+	@$(call install_link, udev, libudev.so.0.6.0, /lib/libudev.so.0)
+	@$(call install_link, udev, libudev.so.0.6.0, /lib/libudev.so)
 endif
 
-ifdef PTXCONF_UDEV__LIBUDEV
-	@$(call install_copy, udev, 0, 0, 0644, -, /lib/libudev.so.0.1.0)
-	@$(call install_link, udev, libudev.so.0.1.0, /lib/libudev.so.0)
-	@$(call install_link, udev, libudev.so.0.1.0, /lib/libudev.so)
+ifdef PTXCONF_UDEV_LIBGUDEV
+	@$(call install_copy, udev, 0, 0, 0644, -, /lib/libgudev-1.0.so.0.0.1)
+	@$(call install_link, udev, libgudev-1.0.so.0.0.1, /lib/libgudev-1.0.so.0)
+	@$(call install_link, udev, libgudev-1.0.so.0.0.1, /lib/libgudev-1.0.so)
 endif
 
 	@$(call install_finish, udev)
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 4197eb7f6..97f84b1c1 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -54,3 +54,11 @@ s/^\(\(# \)\?PTXCONF_BUSYBOX\)_GETOPT_LONG\(.*$\)/\1_LONG_OPTS\3/
 #
 s/^\(\(# \)\?PTXCONF_BZIP2_\)_\(.*$\)/\1\3/
 
+#
+# from   : ptxdist-2010.01.0
+# to     : ptxdist-2010.02.0
+# symbol : UDEV__*	-> UDEV_*
+# reason : cleanup
+#
+s/^\(\(# \)\?PTXCONF_UDEV_\)_\(.*$\)/\1\3/
+