[udev] Updated to version 150 and updated targetinstall
Updated to 150 as proposed on ptxdist mailinglist. Compiles
and works (tested with upstart initmethod).
Added new config options for all files installed in package
dir.
Added install_copy lines for all files found in package dir
and as well some more obscure ones not installed by default.
Crosscompile Patches:
- commented out checks for pci.ids and provide link to file directly.
Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
diff --git a/patches/udev-150/autogen.sh b/patches/udev-150/autogen.sh
new file mode 120000
index 0000000..9f8a4cb
--- /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/fix-crosscompile.patch
b/patches/udev-150/fix-crosscompile.patch
new file mode 100644
index 0000000..5a811eb
--- /dev/null
+++ b/patches/udev-150/fix-crosscompile.patch
@@ -0,0 +1,29 @@
+From: Carsten Schlote <c.schl...@konzeptpark.de>
+Subject: Remove checks for pci.ids to allow cross-compilation.
+
+These checks for pci.ids seem to fail. So commented out and
+path to pci.ids is provided with by commandline option on
+configure.
+
+Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: udev-146/configure.ac
+===================================================================
+--- udev-146.orig/configure.ac 2009-08-10 03:37:42.000000000 +0200
++++ udev-146/configure.ac 2009-12-09 10:11:53.000000000 +0100
+@@ -69,9 +69,9 @@
+ PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
+ AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
+
+- 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])
++# 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])
+ AC_ARG_WITH(pci-ids-path,
+ AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
+ [PCI_DATABASE=${withval}],
diff --git a/patches/udev-150/series b/patches/udev-150/series
new file mode 100644
index 0000000..1752ae8
--- /dev/null
+++ b/patches/udev-150/series
@@ -0,0 +1 @@
+fix-crosscompile.patch
diff --git a/rules/udev.in b/rules/udev.in
index 58db642..2adb224 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -2,7 +2,12 @@
menuconfig UDEV
tristate
prompt "udev "
+ select HOST_GPERF
select ROOTFS_DEV
+ select ACL
+ select USBUTILS
+ select LIBUSB_COMPAT
+ select PCIUTILS
help
udev provides a dynamic device directory containing only the files for
actually present devices. It creates or removes device node files in
the
@@ -71,17 +76,23 @@ menu "extras "
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
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
bool
- prompt "floppy"
+ prompt "create_floppy_devices"
help
FIXME
@@ -91,6 +102,36 @@ menu "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"
+ help
+ Convert HID to HCI IDs
+
+ config UDEV__EXTRA_KEYBOARD_FORCE_RELEASE
+ bool
+ prompt "keyboard-force-release.sh"
+ help
+ Keyboard support
+
+ config UDEV__EXTRA_KEYMAP
+ bool
+ prompt "keymap"
+ help
+ Keymap support
+
+ config UDEV__EXTRA_MODEM_MODESWITCH
+ bool
+ prompt "modem-modeswitch"
+ help
+ Modem support
+
config UDEV__EXTRA_PATH_ID
bool
prompt "path_id"
@@ -98,6 +139,12 @@ menu "extras "
udev callout to create a device path based unique name for a
device to
implement the Linux Persistent Device Naming scheme
+ config UDEV__EXTRA_PCI_DB
+ bool
+ prompt "pci-db"
+ help
+ FIXME
+
config UDEV__EXTRA_RULE_GENERATOR
bool
prompt "rule_generator"
@@ -110,6 +157,18 @@ menu "extras "
help
Used to build unique IDs for an SCSI media to identify it
again
+ config UDEV__EXTRA_UDEV_ACL
+ bool
+ prompt "udev-acl"
+ help
+ FIXME
+
+ config UDEV__EXTRA_USB_DB
+ bool
+ prompt "usb-db"
+ help
+ FIXME
+
config UDEV__EXTRA_USB_ID
bool
prompt "usb_id"
@@ -118,9 +177,21 @@ menu "extras "
USB device. This is required to ensure the same hotplugged
device to
appear always at the same device node (via link)
- config UDEV__EXTRA_VOLUME_ID
+ config UDEV__EXTRA_V4L_ID
+ bool
+ prompt "v4l_id"
+ help
+ FIXME
+
+ config UDEV__EXTRA_WRITE_CD_RULES
+ bool
+ prompt "write_cd_rules"
+ help
+ FIXME
+
+ config UDEV__EXTRA_WRITE_NET_RULES
bool
- prompt "volume_id"
+ prompt "write_net_rules"
help
FIXME
@@ -148,7 +219,24 @@ menu "install options "
prompt "install default udev rules"
help
This will install the generic udev rules files from the udev
package
- under /lib/udev/rules.d/
+ 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
@@ -170,6 +258,12 @@ menu "install options "
help
Install libudev.so on the target.
+ config UDEV__LIBGUDEV
+ bool
+ prompt "install libgudev"
+ help
+ Install libgudev.so on the target.
+
config UDEV_STARTSCRIPT
bool
default y
diff --git a/rules/udev.make b/rules/udev.make
index 0cb15c2..919eac7 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -1,5 +1,4 @@
# -*-makefile-*-
-# $Id: udev.make,v 1.15 2007/03/07 14:34:52 michl Exp $
#
# Copyright (C) 2005-2008 by Robert Schwebel
#
@@ -17,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)
@@ -48,8 +47,18 @@ UDEV_ENV := $(CROSS_ENV)
#
UDEV_AUTOCONF := \
$(CROSS_AUTOCONF_ROOT) \
+ --libexecdir=/lib/udev \
+ \
--disable-dependency-tracking \
- --enable-shared
+ --enable-shared \
+ --enable-extras \
+ --disable-introspection \
+
+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
@@ -99,6 +108,7 @@ endif
# #
# # default rules
# #
+
# install everything apart of drivers rule.
ifdef PTXCONF_UDEV__DEFAULT_RULES
@cd $(UDEV_DIR)/rules/rules.d; \
@@ -109,17 +119,52 @@ ifdef PTXCONF_UDEV__DEFAULT_RULES
done
endif
+# 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, \
@@ -145,11 +190,19 @@ 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, 0755, /etc/init.d/udev)
+ @$(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
@@ -167,6 +220,10 @@ endif
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
@@ -175,10 +232,16 @@ endif
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)
+ @$(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
@@ -186,6 +249,8 @@ endif
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
@@ -194,36 +259,96 @@ ifdef PTXCONF_UDEV__EXTRA_FSTAB_IMPORT
/lib/udev/rules.d/79-fstab_import.rules)
endif
+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
+
+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_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)
@$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/scsi_id)
endif
+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_copy, udev, 0, 0, 0755, -,
/lib/ConsoleKit/run-seat.d/udev-acl.ck, n)
+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
- @$(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__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
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)
+ @$(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__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)
--
ptxdist mailing list
ptxdist@pengutronix.de
