[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>

1 files changed, 204 insertions, 42 deletions

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)