udev: make udev independent from systemd

This way changes to udev from systemd cannot break the legacy udev any
more.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
[mol: moajor rework]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 249 insertions, 150 deletions

diff --git a/rules/systemd.in b/rules/systemd.in
index 389bfd60b..e288eaed3 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -2,6 +2,7 @@
 
 menuconfig SYSTEMD
 	tristate
+	depends on INITMETHOD_SYSTEMD
 	select HOST_GPERF
 	select HOST_CHRPATH
 	# for 'ln --relative'
@@ -14,8 +15,6 @@ menuconfig SYSTEMD
 	select LIBCAP
 	select LIBKMOD
 	select LIBKMOD_TOOLS
-	select UDEV		if RUNTIME
-	select UDEV_LIBUDEV
 	select UTIL_LINUX_NG
 	select UTIL_LINUX_NG_LIBMOUNT
 	select MACHINE_ID	if RUNTIME
@@ -29,7 +28,7 @@ menuconfig SYSTEMD
 	# for udev:
 	select ROOTFS_DEV
 	select LIBBLKID
-	select HOST_SYSTEMD	if UDEV_HWDB
+	select HOST_SYSTEMD	if SYSTEMD_UDEV_HWDB
 	prompt "systemd                       "
 	help
 	  systemd is a system and session manager for Linux, compatible with SysV
@@ -114,5 +113,70 @@ config SYSTEMD_SECCOMP
 	  Enable this if you want to use SystemCallFilter in service files
 
 
+menu "udev                        "
+
+menu "install options               "
+
+config SYSTEMD_UDEV_DRIVERS_RULES
+	bool
+	prompt "install 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 SYSTEMD_UDEV_HWDB
+	bool
+	prompt "install hardware database"
+
+config SYSTEMD_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'
+
+endmenu
+
+menu "persistent device node links  "
+
+config SYSTEMD_UDEV_PERSISTENT_ATA
+	bool
+	prompt "ata"
+
+config SYSTEMD_UDEV_PERSISTENT_CDROM
+	bool
+	prompt "cdrom"
+
+config SYSTEMD_UDEV_PERSISTENT_SCSI
+	bool
+	prompt "scsi"
+
+config SYSTEMD_UDEV_PERSISTENT_V4L
+	bool
+	prompt "v4l"
+
+endmenu
+
+menu "misc helper                   "
+
+config SYSTEMD_UDEV_COLLECT
+	bool
+	prompt "collect"
+	help
+	  Collect variables across events
+
+config SYSTEMD_UDEV_MTD_PROBE
+	bool
+	prompt "mtd_probe"
+	help
+	  autoloads FTL module for mtd devices
+
+endmenu
+
+endmenu
+
 endif
 
diff --git a/rules/systemd.make b/rules/systemd.make
index 001250d56..e3b05ef51 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -118,7 +118,7 @@ SYSTEMD_CONF_OPT	:= \
 	--disable-gnuefi \
 	--disable-tpm \
 	--enable-myhostname \
-	--$(call ptx/endis,PTXCONF_UDEV_HWDB)-hwdb \
+	--$(call ptx/endis,PTXCONF_SYSTEMD_UDEV_HWDB)-hwdb \
 	--disable-manpages \
 	--disable-hibernate \
 	--disable-ldconfig \
@@ -161,7 +161,7 @@ SYSTEMD_LDFLAGS	:= -Wl,-rpath,/lib/systemd
 $(STATEDIR)/systemd.install:
 	@$(call targetinfo)
 	@$(call world/install, SYSTEMD)
-ifdef PTXCONF_UDEV_HWDB
+ifdef PTXCONF_SYSTEMD_UDEV_HWDB
 	@systemd-hwdb update --usr --root $(SYSTEMD_PKGDIR)
 endif
 ifndef PTXCONF_SYSTEMD_VCONSOLE
@@ -209,6 +209,46 @@ SYSTEMD_HELPER := \
 	systemd-update-done \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_VCONSOLE,systemd-vconsole-setup,)
 
+SYSTEMD_UDEV_HELPER-y :=
+
+SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_ATA)	+= ata_id
+SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_CDROM)	+= cdrom_id
+SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_SCSI)	+= scsi_id
+SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_V4L)	+= v4l_id
+SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_COLLECT)		+= collect
+SYSTEMD_UDEV_HELPER-$(PTXCONF_SYSTEMD_UDEV_MTD_PROBE)		+= mtd_probe
+
+SYSTEMD_UDEV_RULES-y := \
+	50-udev-default.rules \
+	60-persistent-alsa.rules \
+	60-persistent-input.rules \
+	60-persistent-storage-tape.rules \
+	60-persistent-storage.rules \
+	60-block.rules \
+	60-drm.rules \
+	60-sensor.rules \
+	60-serial.rules \
+	64-btrfs.rules \
+	70-mouse.rules \
+	75-net-description.rules \
+	78-sound-card.rules \
+	80-net-setup-link.rules
+
+SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_LOGIND) += \
+	70-power-switch.rules \
+	70-uaccess.rules \
+	71-seat.rules \
+	73-seat-late.rules
+
+SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_VCONSOLE) += \
+	90-vconsole.rules
+
+SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_CDROM)	+= 60-cdrom_id.rules
+SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_HWDB)			+= 60-evdev.rules
+SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_PERSISTENT_V4L)	+= 60-persistent-v4l.rules
+SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_MTD_PROBE)		+= 75-probe_mtd.rules
+SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_DRIVERS_RULES)	+= 80-drivers.rules
+
 $(STATEDIR)/systemd.targetinstall:
 	@$(call targetinfo)
 
@@ -340,6 +380,26 @@ endif
 
 	@$(call install_alternative, systemd, 0, 0, 0644, /etc/profile.d/systemd.sh)
 
+	@$(call install_copy, systemd, 0, 0, 0755, -, /lib/systemd/systemd-udevd)
+	@$(call install_copy, systemd, 0, 0, 0755, -, /bin/udevadm)
+	@$(call install_lib, systemd, 0, 0, 0644, libudev)
+
+	@$(foreach helper, $(SYSTEMD_UDEV_HELPER-y), \
+		$(call install_copy, systemd, 0, 0, 0755, -, \
+			/lib/udev//$(helper));)
+
+	@$(foreach rule, $(SYSTEMD_UDEV_RULES-y), \
+		$(call install_copy, systemd, 0, 0, 0644, -, \
+			/lib/udev/rules.d/$(rule));)
+
+ifdef PTXCONF_SYSTEMD_UDEV_HWDB
+	@$(call install_copy, systemd, 0, 0, 0644, -, /lib/udev/hwdb.bin)
+endif
+
+ifdef PTXCONF_SYSTEMD_UDEV_CUST_RULES
+	@$(call install_tree_alternative, v, 0, 0, -, /lib/udev/rules.d)
+endif
+
 	@$(call install_finish, systemd)
 
 	@$(call touch)
diff --git a/rules/udev-bbinit.in b/rules/udev-bbinit.in
index 66fadcc92..57982999c 100644
--- a/rules/udev-bbinit.in
+++ b/rules/udev-bbinit.in
@@ -2,7 +2,7 @@
 
 config UDEV_BBINIT_LINK
 	string
-	depends on UDEV_STARTSCRIPT
+	depends on UDEV_LEGACY_STARTSCRIPT
 	prompt "udev"
 	default "S00udev"
 
diff --git a/rules/udev.in b/rules/udev.in
index bd0af7518..c22d35c25 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -1,15 +1,31 @@
 ## SECTION=shell_and_console
-menuconfig UDEV
+
+config UDEV
+	tristate
+	select VIRTUAL
+	select SYSTEMD		if INITMETHOD_SYSTEMD
+	select UDEV_LEGACY	if !INITMETHOD_SYSTEMD
+
+if UDEV
+
+config UDEV_LIBUDEV
+	bool
+	select UDEV_LEGACY_LIBUDEV	if UDEV_LEGACY
+
+endif
+
+menuconfig UDEV_LEGACY
 	tristate
-	prompt "udev                          "
+	prompt "udev (legacy)                 "
 	select ROOTFS_DEV
 	select ROOTFS_RUN
 	select LIBC_RT
 	select LIBKMOD
 	select LIBBLKID
-	select HOST_GPERF	if UDEV_KEYMAPS
-	select PCIUTILS		if UDEV_PERSISTENT_PCI
-	select USBUTILS		if UDEV_PERSISTENT_USB
+	select HOST_GPERF	if UDEV_LEGACY_KEYMAPS
+	select PCIUTILS		if UDEV_LEGACY_PERSISTENT_PCI
+	select USBUTILS		if UDEV_LEGACY_PERSISTENT_USB
+	depends on SYSTEMD = n
 	help
 	  udev provides a dynamic device directory containing only the files for
 	  actually present devices. It creates or removes device node files in the
@@ -27,13 +43,11 @@ menuconfig UDEV
 	  Ensure: This udev implementation requires at least kernel 2.6.32 and
 	  must have sysfs, unix domain sockets, networking and devtmpfs enabled.
 
-if UDEV
-
-if SYSTEMD = n
+if UDEV_LEGACY
 
 menu "build options                 "
 
-config UDEV_DEBUG
+config UDEV_LEGACY_DEBUG
 	bool
 	prompt "enable debug messages"
 	help
@@ -41,7 +55,7 @@ config UDEV_DEBUG
 	  into the udev binaries. The actual level of debugging is specified
 	  in the udev config file (refer entry "udev_log")
 
-config UDEV_SYSLOG
+config UDEV_LEGACY_SYSLOG
 	bool
 	prompt "enable system logging"
 	help
@@ -51,21 +65,18 @@ config UDEV_SYSLOG
 
 endmenu
 
-endif
-
 menu "install options               "
 
-config UDEV_ETC_CONF
+config UDEV_LEGACY_ETC_CONF
 	bool
 	default y
-	depends on SYSTEMD = n
 	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_DRIVERS_RULES
+config UDEV_LEGACY_DRIVERS_RULES
 	bool
 	prompt "install udev driver rules"
 	help
@@ -75,33 +86,27 @@ config UDEV_DRIVERS_RULES
 	  udev start.
 	  If unsure say Y.
 
-config UDEV_KEYMAPS
+config UDEV_LEGACY_KEYMAPS
 	bool
-	depends on SYSTEMD = n
 	prompt "install keymaps"
 	help
 	  This will install the keymaps shipped with udev. These are mostly
 	  to map custom hardware's multimedia keys of various laptops
 
-config UDEV_HWDB
-	bool
-	depends on SYSTEMD
-	prompt "install hardware database"
-
-config UDEV_CUST_RULES
+config UDEV_LEGACY_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
+config UDEV_LEGACY_LIBUDEV
 	bool
 	prompt "install libudev"
 	help
 	  Install libudev.so on the target.
 
-config UDEV_STARTSCRIPT
+config UDEV_LEGACY_STARTSCRIPT
 	bool
 	default y
 	prompt "install /etc/init.d/udev"
@@ -113,38 +118,35 @@ endmenu
 
 menu "persistent device node links  "
 
-config UDEV_PERSISTENT_ATA
+config UDEV_LEGACY_PERSISTENT_ATA
 	bool
 	prompt "ata"
 
-config UDEV_PERSISTENT_CDROM
+config UDEV_LEGACY_PERSISTENT_CDROM
 	bool
 	prompt "cdrom"
 
-config UDEV_PERSISTENT_GENERATOR
+config UDEV_LEGACY_PERSISTENT_GENERATOR
 	bool
-	depends on SYSTEMD = n
 	prompt "cd / network generator"
 	help
 	  This will generate udev-based persistent naming rules for
 	  your CD/DVD media and network devices
 	  Warning: this needs write access to /etc/udev/rules.d/
 
-config UDEV_PERSISTENT_PCI
+config UDEV_LEGACY_PERSISTENT_PCI
 	bool
-	depends on SYSTEMD = n
 	prompt "pci"
 
-config UDEV_PERSISTENT_USB
+config UDEV_LEGACY_PERSISTENT_USB
 	bool
-	depends on SYSTEMD = n
 	prompt "usb"
 
-config UDEV_PERSISTENT_SCSI
+config UDEV_LEGACY_PERSISTENT_SCSI
 	bool
 	prompt "scsi"
 
-config UDEV_PERSISTENT_V4L
+config UDEV_LEGACY_PERSISTENT_V4L
 	bool
 	prompt "v4l"
 
@@ -152,7 +154,7 @@ endmenu
 
 menu "misc helper                   "
 
-config UDEV_ACCELEROMETER
+config UDEV_LEGACY_ACCELEROMETER
 	bool
 	depends on SYSTEMD = n
 	prompt "accelerometer"
@@ -162,13 +164,13 @@ config UDEV_ACCELEROMETER
 	  value of the property, calculate the device's new orientation,
 	  and export it as ID_INPUT_ACCELEROMETER_ORIENTATION.
 
-config UDEV_COLLECT
+config UDEV_LEGACY_COLLECT
 	bool
 	prompt "collect"
 	help
 	  Collect variables across events
 
-config UDEV_MTD_PROBE
+config UDEV_LEGACY_MTD_PROBE
 	bool
 	prompt "mtd_probe"
 	help
diff --git a/rules/udev.make b/rules/udev.make
index ac582debe..739c99141 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -14,22 +14,28 @@
 #
 PACKAGES-$(PTXCONF_UDEV) += udev
 
+ifdef PTXCONF_INITMETHOD_SYSTEMD
+UDEV_LICENSE = $(SYSTEMD_LICENSE)
+else
+UDEV_LICENSE = $(UDEV_LEGACY_LICENSE)
+endif
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_UDEV_LEGACY) += udev-legacy
+
 #
 # Paths and names
 #
-ifdef PTXCONF_SYSTEMD
-UDEV_VERSION	= $(SYSTEMD_VERSION)
-UDEV		= $(SYSTEMD)
-UDEV_LICENSE	= $(SYSTEMD_LICENSE)
-else
-UDEV_VERSION	:= 182
-UDEV_MD5	:= e31c83159b017e8ab0fa2f4bca758a41
-UDEV		:= udev-$(UDEV_VERSION)
-UDEV_SUFFIX	:= tar.bz2
-UDEV_URL	:= $(call ptx/mirror, KERNEL, utils/kernel/hotplug/$(UDEV).$(UDEV_SUFFIX))
-UDEV_SOURCE	:= $(SRCDIR)/$(UDEV).$(UDEV_SUFFIX)
-UDEV_DIR	:= $(BUILDDIR)/$(UDEV)
-UDEV_LICENSE	:= GPL-2.0
+UDEV_LEGACY_VERSION	:= 182
+UDEV_LEGACY_MD5		:= e31c83159b017e8ab0fa2f4bca758a41
+UDEV_LEGACY		:= udev-$(UDEV_LEGACY_VERSION)
+UDEV_LEGACY_SUFFIX	:= tar.bz2
+UDEV_LEGACY_URL		:= $(call ptx/mirror, KERNEL, utils/kernel/hotplug/$(UDEV_LEGACY).$(UDEV_LEGACY_SUFFIX))
+UDEV_LEGACY_SOURCE	:= $(SRCDIR)/$(UDEV_LEGACY).$(UDEV_LEGACY_SUFFIX)
+UDEV_LEGACY_DIR		:= $(BUILDDIR)/$(UDEV_LEGACY)
+UDEV_LEGACY_LICENSE	:= GPL-2.0
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -38,159 +44,117 @@ UDEV_LICENSE	:= GPL-2.0
 #
 # autoconf
 #
-UDEV_CONF_ENV := \
+UDEV_LEGACY_CONF_ENV := \
 	$(CROSS_ENV) \
 	CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)"
 
-UDEV_CONF_TOOL	:= autoconf
-UDEV_CONF_OPT	:= \
+UDEV_LEGACY_CONF_TOOL	:= autoconf
+UDEV_LEGACY_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_ROOT) \
+	--libexecdir=/lib \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-static \
 	--enable-shared \
 	--disable-gtk-doc \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
-	--$(call ptx/endis,PTXCONF_UDEV_DEBUG)-debug \
-	--$(call ptx/endis,PTXCONF_UDEV_SYSLOG)-logging \
+	--$(call ptx/endis,PTXCONF_UDEV_LEGACY_DEBUG)-debug \
+	--$(call ptx/endis,PTXCONF_UDEV_LEGACY_SYSLOG)-logging \
+	--disable-manpages \
 	--disable-gudev \
 	--disable-introspection \
-	--$(call ptx/endis,PTXCONF_UDEV_KEYMAPS)-keymap \
-	--$(call ptx/endis,PTXCONF_UDEV_PERSISTENT_GENERATOR)-rule_generator \
+	--$(call ptx/endis,PTXCONF_UDEV_LEGACY_KEYMAPS)-keymap \
+	--$(call ptx/endis,PTXCONF_UDEV_LEGACY_MTD_PROBE)-mtd_probe \
+	--$(call ptx/endis,PTXCONF_UDEV_LEGACY_PERSISTENT_GENERATOR)-rule_generator \
 	--disable-floppy \
-	--without-selinux \
-	--with-usb-ids-path=/usr/share/usb.ids \
-	--with-pci-ids-path=/usr/share/pci.ids$(call ptx/ifdef, PTXCONF_PCIUTILS_COMPRESS,.gz,) \
-	--with-systemdsystemunitdir=/lib/systemd/system
-
-UDEV_CONF_OPT += \
-	--disable-manpages \
-	--libexecdir=/lib \
 	--with-rootprefix= \
 	--with-rootlibdir=/lib \
-	--$(call ptx/endis,PTXCONF_UDEV_MTD_PROBE)-mtd_probe
-
-endif # PTXCONF_SYSTEMD
+	--without-selinux \
+	--with-usb-ids-path=/usr/share/usb.ids \
+	--with-pci-ids-path=/usr/share/pci.ids$(call ptx/ifdef, PTXCONF_PCIUTILS_COMPRESS,.gz,)
 
-UDEV_RULES-y := \
+UDEV_LEGACY_RULES-y := \
 	50-udev-default.rules \
 	60-persistent-alsa.rules \
 	60-persistent-input.rules \
+	60-persistent-serial.rules \
 	60-persistent-storage-tape.rules \
 	60-persistent-storage.rules \
 	75-net-description.rules \
-	78-sound-card.rules
-
-ifndef PTXCONF_SYSTEMD
-UDEV_RULES-y += \
-	60-persistent-serial.rules \
 	75-tty-description.rules \
+	78-sound-card.rules \
 	95-udev-late.rules
-endif
 
-UDEV_RULES-$(PTXCONF_SYSTEMD) += \
-	60-block.rules \
-	60-drm.rules \
-	60-sensor.rules \
-	60-serial.rules \
-	64-btrfs.rules \
-	70-mouse.rules \
-	80-net-setup-link.rules
-
-UDEV_RULES-$(PTXCONF_SYSTEMD_LOGIND) += \
-	70-power-switch.rules \
-	70-uaccess.rules \
-	71-seat.rules \
-	73-seat-late.rules
-
-UDEV_RULES-$(PTXCONF_SYSTEMD_VCONSOLE) += \
-	90-vconsole.rules
-
-UDEV_RULES-$(PTXCONF_UDEV_ACCELEROMETER)	+= 61-accelerometer.rules
-UDEV_RULES-$(PTXCONF_UDEV_DRIVERS_RULES)	+= 80-drivers.rules
-UDEV_RULES-$(PTXCONF_UDEV_HWDB)			+= 60-evdev.rules
-UDEV_RULES-$(PTXCONF_UDEV_KEYMAPS)		+= 95-keyboard-force-release.rules
-UDEV_RULES-$(PTXCONF_UDEV_KEYMAPS)		+= 95-keymap.rules
-UDEV_RULES-$(PTXCONF_UDEV_MTD_PROBE)		+= 75-probe_mtd.rules
-UDEV_RULES-$(PTXCONF_UDEV_PERSISTENT_CDROM)	+= 60-cdrom_id.rules
-UDEV_RULES-$(PTXCONF_UDEV_PERSISTENT_EDD)	+= 61-persistent-storage-edd.rules
-UDEV_RULES-$(PTXCONF_UDEV_PERSISTENT_GENERATOR)	+= 75-cd-aliases-generator.rules
-UDEV_RULES-$(PTXCONF_UDEV_PERSISTENT_GENERATOR)	+= 75-persistent-net-generator.rules
-UDEV_RULES-$(PTXCONF_UDEV_PERSISTENT_V4L)	+= 60-persistent-v4l.rules
-
-UDEV_HELPER-$(PTXCONF_UDEV_ACCELEROMETER)		+= accelerometer
-UDEV_HELPER-$(PTXCONF_UDEV_PERSISTENT_ATA)		+= ata_id
-UDEV_HELPER-$(PTXCONF_UDEV_PERSISTENT_CDROM)		+= cdrom_id
-UDEV_HELPER-$(PTXCONF_UDEV_COLLECT)			+= collect
-UDEV_HELPER-$(PTXCONF_UDEV_PERSISTENT_EDD)		+= edd_id
-UDEV_HELPER-$(PTXCONF_UDEV_KEYMAPS)			+= findkeyboards
-UDEV_HELPER-$(PTXCONF_UDEV_KEYMAPS)			+= keyboard-force-release.sh
-UDEV_HELPER-$(PTXCONF_UDEV_KEYMAPS)			+= keymap
-UDEV_HELPER-$(PTXCONF_UDEV_MTD_PROBE)			+= mtd_probe
-UDEV_HELPER-$(PTXCONF_UDEV_PERSISTENT_GENERATOR)	+= rule_generator.functions
-UDEV_HELPER-$(PTXCONF_UDEV_PERSISTENT_SCSI)		+= scsi_id
-UDEV_HELPER-$(PTXCONF_UDEV_PERSISTENT_V4L)		+= v4l_id
-UDEV_HELPER-$(PTXCONF_UDEV_PERSISTENT_GENERATOR)	+= write_cd_rules
-UDEV_HELPER-$(PTXCONF_UDEV_PERSISTENT_GENERATOR)	+= write_net_rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_PERSISTENT_CDROM)	+= 60-cdrom_id.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_PERSISTENT_V4L)		+= 60-persistent-v4l.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_ACCELEROMETER)		+= 61-accelerometer.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_PERSISTENT_EDD)		+= 61-persistent-storage-edd.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_PERSISTENT_GENERATOR)	+= 75-cd-aliases-generator.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_PERSISTENT_GENERATOR)	+= 75-persistent-net-generator.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_MTD_PROBE)		+= 75-probe_mtd.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_DRIVERS_RULES)		+= 80-drivers.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_KEYMAPS)		+= 95-keyboard-force-release.rules
+UDEV_LEGACY_RULES-$(PTXCONF_UDEV_LEGACY_KEYMAPS)		+= 95-keymap.rules
+
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_ACCELEROMETER)		+= accelerometer
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_PERSISTENT_ATA)	+= ata_id
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_PERSISTENT_CDROM)	+= cdrom_id
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_COLLECT)		+= collect
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_PERSISTENT_EDD)	+= edd_id
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_KEYMAPS)		+= findkeyboards
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_KEYMAPS)		+= keyboard-force-release.sh
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_KEYMAPS)		+= keymap
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_MTD_PROBE)		+= mtd_probe
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_PERSISTENT_GENERATOR)	+= rule_generator.functions
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_PERSISTENT_SCSI)	+= scsi_id
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_PERSISTENT_V4L)	+= v4l_id
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_PERSISTENT_GENERATOR)	+= write_cd_rules
+UDEV_LEGACY_HELPER-$(PTXCONF_UDEV_LEGACY_PERSISTENT_GENERATOR)	+= write_net_rules
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-ifdef PTXCONF_SYSTEMD
-$(STATEDIR)/systemd.prepare: $(STATEDIR)/udev.prepare
-$(STATEDIR)/udev.install: $(STATEDIR)/systemd.install.post
-$(STATEDIR)/udev.install.unpack: $(STATEDIR)/systemd.install.post
-endif
-
-$(STATEDIR)/udev.targetinstall:
+$(STATEDIR)/udev-legacy.targetinstall:
 	@$(call targetinfo)
 
 	@$(call install_init, udev)
 	@$(call install_fixup, udev,PRIORITY,optional)
 	@$(call install_fixup, udev,SECTION,base)
 	@$(call install_fixup, udev,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, udev,DESCRIPTION,missing)
+	@$(call install_fixup, udev,DESCRIPTION,"udev standalone")
 
-ifdef PTXCONF_UDEV_ETC_CONF
+ifdef PTXCONF_UDEV_LEGACY_ETC_CONF
 	@$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf)
 endif
-ifdef PTXCONF_UDEV_HWDB
-	@$(call install_copy, udev, 0, 0, 0644, -, /lib/udev/hwdb.bin)
-endif
 
-ifdef PTXCONF_SYSTEMD
-	@$(call install_copy, udev, 0, 0, 0755, -, /lib/systemd/systemd-udevd)
-	@$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm)
-else
 	@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/udevd)
 	@$(call install_copy, udev, 0, 0, 0755, -, /bin/udevadm)
-endif
 
-	@$(foreach rule, $(UDEV_RULES-y), \
+	@$(foreach rule, $(UDEV_LEGACY_RULES-y), \
 		$(call install_copy, udev, 0, 0, 0644, -, \
 			/lib/udev/rules.d/$(rule));)
 
-ifdef PTXCONF_UDEV_KEYMAPS
-	@cd $(UDEV_PKGDIR) && \
+ifdef PTXCONF_UDEV_LEGACY_KEYMAPS
+	@cd $(UDEV_LEGACY_PKGDIR) && \
 	for keymap in `find lib/udev/keymaps/ -type f`; do \
 		$(call install_copy, udev, 0, 0, 0644, -, /$$keymap); \
 	done
 endif
 
-ifdef PTXCONF_UDEV_CUST_RULES
+ifdef PTXCONF_UDEV_LEGACY_CUST_RULES
 	@$(call install_alternative_tree, udev, 0, 0, /lib/udev/rules.d)
 endif
 
-	@$(foreach helper, $(UDEV_HELPER-y), \
+	@$(foreach helper, $(UDEV_LEGACY_HELPER-y), \
 		$(call install_copy, udev, 0, 0, 0755, -, \
 			/lib/udev//$(helper));)
 
-ifdef PTXCONF_UDEV_LIBUDEV
+ifdef PTXCONF_UDEV_LEGACY_LIBUDEV
 	@$(call install_lib, udev, 0, 0, 0644, libudev)
 endif
 
-ifdef PTXCONF_UDEV_STARTSCRIPT
+ifdef PTXCONF_UDEV_LEGACY_STARTSCRIPT
 ifdef PTXCONF_INITMETHOD_BBINIT
 	@$(call install_alternative, udev, 0, 0, 0755, /etc/init.d/udev)
 
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 541cf9b95..8f52662cf 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -263,3 +263,12 @@ s/^\(\(# \)\?PTXCONF_\)BASH_COMPLETION/\1BASH_BASHCOMPLETION/
 # reason : options renamed
 #
 s/^\(\(# \)\?PTXCONF_\)PYTHON_DJANGO/\1PYTHON3_DJANGO/
+#
+# from   : ptxdist-2016.12.0
+# to     : ptxdist-2017.01.0
+# symbol : UDEV_* -> UDEV_LEGACY_* / SYSTEMD_UDEV_*
+# reason : systemd / udev split
+#
+s/^\(\(# \)\?PTXCONF_\)UDEV_\(DEBUG\|SYSLOG\|ETC_CONF\|KEYMAPS\|STARTSCRIPT\|ACCELEROMETER\)\>/\1UDEV_LEGACY_\3/
+s/^\(\(# \)\?PTXCONF_\)UDEV_\(DRIVERS_RULES\|CUST_RULES\|PERSISTENT_.*\|COLLECT\|MTD_PROBE\)\>\(.*\)$/\1UDEV_LEGACY_\3\4\n\1SYSTEMD_UDEV_\3\4/
+s/^\(\(# \)\?PTXCONF_\)UDEV_\(HWDB\)\>/\1SYSTEMD_UDEV_\3/