udev: bump to 181 and other fixes

PATCH New yegorslists at googlemail.com 3 participants 4 messages Feb 7, 2012 – Feb 8, 2012

lore

Share & tools

lore

yegorslists at googlemail.com

author

2012-02-07 16:16 UTC #0 lore raw

PATCH 1/2 udev: bump to 181 and other fixes

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

Changes:
- Linux kernel requirement: 2.6.34 and above (devtmpfs is mandatory) (this also applies to the chosen toolchain, because of Kernel headers)
- optional dependency on libusb and usbutils removed
- added dependency on kmod
- added dependency on util-linux for libblkid
- install in /lib/udev instead of /usr/libexec/udev
- udevd moved to /lib/udev
- fixed path to pci.ids and usb.ids
- persistent rules generator is disabled by default, so option is introduced to enable this option if desired

Signed-off-by Yegor Yefremov <[email protected]>

Signed-off-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

---
 package/udev/Config.in   |   26 +++++++++++++++++---------
 package/udev/S10udev     |    4 ++--
 package/udev/udev.mk     |   20 ++++++++++++--------
 target/generic/Config.in |    2 ++
 4 files changed, 33 insertions(+), 19 deletions(-)

package/udev/Config.in +17 -9

index 391c718..dfb4f0d 100644
@@ -1,31 +1,39 @@
 config BR2_PACKAGE_UDEV
 	bool "udev"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	depends on BR2_LARGEFILE # util-linux
+	depends on BR2_USE_WCHAR # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	select BR2_PACKAGE_KMOD
 	help
 	  Userspace device daemon.
 
+	  udev requires a Linux kernel >= 2.6.34: it relies on devtmpfs.
+
 	  ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 
 if BR2_PACKAGE_UDEV
 
+config BR2_PACKAGE_UDEV_RULES_GEN
+	bool "enable rules generator"
+	help
+	  Enable persistant rules generator
+
 config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	bool "enable all extras"
-	depends on BR2_LARGEFILE # acl
-	depends on BR2_USE_WCHAR # libglib2
 	select BR2_PACKAGE_ACL
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	select BR2_PACKAGE_USBUTILS
 	select BR2_PACKAGE_HWDATA
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Enable all extras with external dependencies like
-	  libacl, libusb, libusb-compat, usbutils, hwdata
-
-comment "udev extras requires a toolchain with LARGEFILE + WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+	  libacl, hwdata and libglib2
 
 endif
 
 comment "udev requires /dev mgmnt set to udev under System configuration"
 	depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+
+comment "udev requires a toolchain with LARGEFILE + WCHAR support"
+    depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+

package/udev/S10udev +2 -2

index 29eb107..70a7c34 100755
@@ -2,7 +2,7 @@
 #
 # udev	This is a minimal non-LSB version of a UDEV startup script.  It
 #	was derived by stripping down the udev-058 LSB version for use
-#	with buildroot on embedded hardware using Linux 2.6.12+ kernels.
+#	with buildroot on embedded hardware using Linux 2.6.34+ kernels.
 #
 #	You may need to customize this for your system's resource limits
 #	(including startup time!) and administration.  For example, if

@@ -17,7 +17,7 @@
 #
 
 # Check for missing binaries
-UDEV_BIN=/sbin/udevd
+UDEV_BIN=/lib/udev/udevd
 test -x $UDEV_BIN || exit 5
 
 # Check for config file and read it

package/udev/udev.mk +12 -8

index 1825396..88df268 100644
@@ -3,7 +3,7 @@
 # udev
 #
 #############################################################
-UDEV_VERSION = 173
+UDEV_VERSION = 181
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 UDEV_INSTALL_STAGING = YES

@@ -11,20 +11,24 @@ UDEV_INSTALL_STAGING = YES
 UDEV_CONF_OPT =			\
 	--sbindir=/sbin		\
 	--with-rootlibdir=/lib	\
-	--libexecdir=/lib/udev	\
+	--libexecdir=/lib	\
+	--with-usb-ids-path=/usr/share/hwdata/usb.ids	\
+	--with-pci-ids-path=/usr/share/hwdata/pci.ids	\
+	--with-firmware-path=/lib/firmware		\
 	--disable-introspection
 
-UDEV_DEPENDENCIES = host-gperf host-pkg-config
+UDEV_DEPENDENCIES = host-gperf host-pkg-config util-linux kmod
+
+ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y)
+UDEV_CONF_OPT += --enable-rule_generator
+endif
 
 ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)
-UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
-UDEV_CONF_OPT +=							\
-	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
-	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\
+UDEV_DEPENDENCIES += acl usbutils hwdata libglib2
+UDEV_CONF_OPT +=		\
 	--enable-udev_acl
 else
 UDEV_CONF_OPT +=		\
-	--disable-hwdb		\
 	--disable-gudev
 endif

target/generic/Config.in +2 -0

index a91de32..5334a4b 100644
@@ -28,6 +28,8 @@ config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV
 
 config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
 	bool "Dynamic using udev"
+	depends on BR2_LARGEFILE # udev
+	depends on BR2_USE_WCHAR # udev
 	select BR2_PACKAGE_UDEV
 
 endchoice

Signature · 1 line

1.7.5.4

yegorslists at googlemail.com

author

2012-02-07 16:16 UTC #1 lore raw

PATCH 2/2 kmod: bump to 5

From: Yegor Yefremov <[email protected]>

Signed-off-by Yegor Yefremov <[email protected]>

---
 package/kmod/kmod.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

package/kmod/kmod.mk +1 -1

index 0e3bc34..acf5f0a 100644
@@ -1,4 +1,4 @@
-KMOD_VERSION = 4
+KMOD_VERSION = 5
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = http://packages.profusion.mobi/kmod/
 KMOD_INSTALL_STAGING = YES

Signature · 1 line

1.7.5.4

Arnout Vandecappelle

2012-02-07 19:44 UTC #2 lore raw

PATCH 1/2 udev: bump to 181 and other fixes

In reply to yegorslists at googlemail.com

Quoted 1 line · On Tuesday 07 February 2012 17:16:19 yegorslists at googlemail.com wrote:

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

Sorry about that - I have --reset-author on by default on
git commit --amend. Yegor should remain as author, of course.

[snip]

Quoted 17 lines

config BR2_PACKAGE_UDEV_ALL_EXTRAS

package/udev/Config.in +1 -9

 	bool "enable all extras"
-	depends on BR2_LARGEFILE # acl
-	depends on BR2_USE_WCHAR # libglib2
 	select BR2_PACKAGE_ACL
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	select BR2_PACKAGE_USBUTILS
 	select BR2_PACKAGE_HWDATA
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Enable all extras with external dependencies like
-	  libacl, libusb, libusb-compat, usbutils, hwdata
-
-comment "udev extras requires a toolchain with LARGEFILE + WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+	  libacl, hwdata and libglib2

[snip]

package/udev/udev.mk UDEV_INSTALL_STAGING = YES · line 27

Quoted 6 lines

ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)

package/udev/udev.mk +1 -4

-UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
-UDEV_CONF_OPT +=							\
-	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
-	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\
+UDEV_DEPENDENCIES += acl usbutils hwdata libglib2

There's an inconsistency between the config and the mk-file here:
mk-file depends on usbutils but Config.in doesn't select it. I realize I wrote this myself - to err is human :-)

Regards,
Arnout

Signature · 6 lines

Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Yegor Yefremov

2012-02-08 09:52 UTC #3 lore raw

PATCH 1/2 udev: bump to 181 and other fixes

Am 07.02.2012 20:44, schrieb Arnout Vandecappelle:

Quoted 5 lines · On Tuesday 07 February 2012 17:16:19 yegorslists at googlemail.com wrote:

Quoted 1 line
From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>
Sorry about that - I have --reset-author on by default on
git commit --amend. Yegor should remain as author, of course.

Changed

Quoted 19 lines

[snip]

Quoted 17 lines

config BR2_PACKAGE_UDEV_ALL_EXTRAS

package/udev/Config.in +1 -9

 	bool "enable all extras"
-	depends on BR2_LARGEFILE # acl
-	depends on BR2_USE_WCHAR # libglib2
 	select BR2_PACKAGE_ACL
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	select BR2_PACKAGE_USBUTILS
 	select BR2_PACKAGE_HWDATA
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Enable all extras with external dependencies like
-	  libacl, libusb, libusb-compat, usbutils, hwdata
-
-comment "udev extras requires a toolchain with LARGEFILE + WCHAR support"
-	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+	  libacl, hwdata and libglib2

[snip]

Quoted 10 lines

package/udev/udev.mk UDEV_INSTALL_STAGING = YES · line 27
Quoted 6 lines
ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)
package/udev/udev.mk +1 -4
-UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
-UDEV_CONF_OPT +=							\
-	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
-	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\
+UDEV_DEPENDENCIES += acl usbutils hwdata libglib2
There's an inconsistency between the config and the mk-file here:
mk-file depends on usbutils but Config.in doesn't select it. I realize I wrote this myself - to err is human :-)

I had to check this too. Fixed. Thanks.

Yegor