From: Carsten Schlote <c.schl...@konzeptpark.de>
Required for latest upstart 0.6.3
Signed-off-by: Carsten Schlote <c.schl...@konzeptpark.de>
---
patches/udev-147/autogen.sh | 16 +++++++
patches/udev-147/fix-crosscompile.patch | 21 +++++++++
patches/udev-147/series | 1 +
rules/udev.in | 41 ++++++++++++++++-
rules/udev.make | 72 +++++++++++++++++++++++--------
5 files changed, 130 insertions(+), 21 deletions(-)
create mode 100644 patches/udev-147/autogen.sh
create mode 100644 patches/udev-147/fix-crosscompile.patch
create mode 100644 patches/udev-147/series
diff --git a/patches/udev-147/autogen.sh b/patches/udev-147/autogen.sh
new file mode 100644
index 0000000..cd5c6d6
--- /dev/null
+++ b/patches/udev-147/autogen.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+aclocal $ACLOCAL_FLAGS
+
+libtoolize \
+ --force \
+ --copy
+
+autoreconf \
+ --force \
+ --install \
+ --warnings=cross \
+ --warnings=syntax \
+ --warnings=obsolete \
+ --warnings=unsupported
+
diff --git a/patches/udev-147/fix-crosscompile.patch
b/patches/udev-147/fix-crosscompile.patch
new file mode 100644
index 0000000..521233d
--- /dev/null
+++ b/patches/udev-147/fix-crosscompile.patch
@@ -0,0 +1,21 @@
+---
+ 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-147/series b/patches/udev-147/series
new file mode 100644
index 0000000..1752ae8
--- /dev/null
+++ b/patches/udev-147/series
@@ -0,0 +1 @@
+fix-crosscompile.patch
diff --git a/rules/udev.in b/rules/udev.in
index 58db642..e68a26a 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -2,7 +2,13 @@
menuconfig UDEV
tristate
prompt "udev "
+ select HOST_GPERF
select ROOTFS_DEV
+ select ACL
+ select USBUTILS
+ select LIBUSB_COMPAT
+ select PCIUTILS
+ #select GOBJECT_INTROSPECTION # Broken in-trre build tools!
help
udev provides a dynamic device directory containing only the files for
actually present devices. It creates or removes device node files in
the
@@ -98,6 +104,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 +122,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 +142,9 @@ 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 "volume_id"
+ prompt "v4l_id"
help
FIXME
@@ -148,7 +172,18 @@ 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__COMMON_RULES
bool
diff --git a/rules/udev.make b/rules/udev.make
index 0cb15c2..65db800 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -1,5 +1,3 @@
-# -*-makefile-*-
-# $Id: udev.make,v 1.15 2007/03/07 14:34:52 michl Exp $
#
# Copyright (C) 2005-2008 by Robert Schwebel
#
@@ -17,7 +15,7 @@ PACKAGES-$(PTXCONF_UDEV) += udev
#
# Paths and names
#
-UDEV_VERSION := 140
+UDEV_VERSION := 147
UDEV := udev-$(UDEV_VERSION)
UDEV_SUFFIX := tar.bz2
UDEV_SOURCE := $(SRCDIR)/$(UDEV).$(UDEV_SUFFIX)
@@ -48,8 +46,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 +107,7 @@ endif
# #
# # default rules
# #
+
# install everything apart of drivers rule.
ifdef PTXCONF_UDEV__DEFAULT_RULES
@cd $(UDEV_DIR)/rules/rules.d; \
@@ -109,13 +118,23 @@ 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
+
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-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);
@@ -145,12 +164,20 @@ 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
# #
@@ -198,32 +225,41 @@ 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, 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)
+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)
-
- @$(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_V4L_ID
+ @$(call install_copy, udev, 0, 0, 0755, -, /lib/udev/v4l_id)
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.5.1)
+ @$(call install_link, udev, libudev.so.0.5.1, /lib/libudev.so.0)
+ @$(call install_link, udev, libudev.so.0.5.1, /lib/libudev.so)
endif
@$(call install_finish, udev)
--
1.6.5.6.gb3118
--
ptxdist mailing list
ptxdist@pengutronix.de
