Skip to contentSkip to conversation

udev: bump to 177

PATCH New yegorslists at googlemail.com 3 participants 5 messages Jan 18, 2012 – Jan 20, 2012

lore
Share & tools
lore

yegorslists at googlemail.com

author
#0 lore raw

PATCH 1/2 udev: bump to 177

From: Yegor Yefremov <[email protected]>

Signed-off-by Yegor Yefremov <[email protected]>
---
 package/udev/Config.in |    9 ++++++++-
 package/udev/S10udev   |    2 +-
 package/udev/udev.mk   |   15 ++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)
package/udev/Config.in +8 -1
index 391c718..e793496 100644
@@ -1,6 +1,9 @@
 config BR2_PACKAGE_UDEV
 	bool "udev"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_USBUTILS
+	select BR2_PACKAGE_KMOD
 	help
 	  Userspace device daemon.
 

@@ -8,6 +11,11 @@ config BR2_PACKAGE_UDEV
 
 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

@@ -15,7 +23,6 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS
 	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
package/udev/S10udev +1 -1
index 29eb107..928c7b6 100755
@@ -17,7 +17,7 @@
 #
 
 # Check for missing binaries
-UDEV_BIN=/sbin/udevd
+UDEV_BIN=/lib/udev/udev/udevd
 test -x $UDEV_BIN || exit 5
 
 # Check for config file and read it
package/udev/udev.mk +10 -5
index 1825396..395899a 100644
@@ -3,7 +3,7 @@
 # udev
 #
 #############################################################
-UDEV_VERSION = 173
+UDEV_VERSION = 177
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 UDEV_INSTALL_STAGING = YES

@@ -12,15 +12,20 @@ UDEV_CONF_OPT =			\
 	--sbindir=/sbin		\
 	--with-rootlibdir=/lib	\
 	--libexecdir=/lib/udev	\
+	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
+	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\
+	--with-firmware-path=/lib/firmware				\
 	--disable-introspection
 
-UDEV_DEPENDENCIES = host-gperf host-pkg-config
+UDEV_DEPENDENCIES = host-gperf host-pkg-config e2fsprogs kmod usbutils
+
+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_DEPENDENCIES += libusb libusb-compat acl 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	\
 	--enable-udev_acl
 else
 UDEV_CONF_OPT +=		\
Signature · 1 line
1.7.1.1
#2 lore raw

PATCH 1/2 udev: bump to 177

In reply to yegorslists at googlemail.com
Quoted 3 lines · On Wednesday 18 January 2012 09:18:36 yegorslists at googlemail.com wrote:

From: Yegor Yefremov <[email protected]>

Signed-off-by Yegor Yefremov <[email protected]>
Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Quoted 11 lines
---
 package/udev/Config.in |    9 ++++++++-
 package/udev/S10udev   |    2 +-
 package/udev/udev.mk   |   15 ++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)
package/udev/Config.in +0 -0
index 391c718..e793496 100644

package/udev/Config.in line 5

Quoted 5 lines
package/udev/Config.in +2 -0
@@ -1,6 +1,9 @@
 config BR2_PACKAGE_UDEV
 	bool "udev"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_USBUTILS

Are these dependencies really required now? They're kind of
silly if you don't have e2fs or USB on your target system...

If they are required now, can you add a comment about it to the
commit message?

package/udev/Config.in config BR2_PACKAGE_UDEV · line 18

Quoted 13 lines
package/udev/Config.in +6 -0
+	select BR2_PACKAGE_KMOD
 	help
 	  Userspace device daemon.
 

@@ -8,6 +11,11 @@ config BR2_PACKAGE_UDEV
 
 if BR2_PACKAGE_UDEV
 
+config BR2_PACKAGE_UDEV_RULES_GEN
+	bool "enable rules generator"
+	help
+	  Enable persistant rules generator
+

Also please mention this option in the commit message.

[snip]

Quoted 14 lines
package/udev/udev.mk +1 -1
index 1825396..395899a 100644
@@ -3,7 +3,7 @@
 # udev
 #
 #############################################################
-UDEV_VERSION = 173
+UDEV_VERSION = 177
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 UDEV_INSTALL_STAGING = YES

package/udev/udev.mk UDEV_CONF_OPT = \ · line 17

Quoted 6 lines
package/udev/udev.mk +2 -0
@@ -12,15 +12,20 @@ UDEV_CONF_OPT =			\
 	--sbindir=/sbin		\
 	--with-rootlibdir=/lib	\
 	--libexecdir=/lib/udev	\
+	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
 
+	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\

I haven't actually ran it, but:

- I have the usb.ids in /usr/share/usb.ids

- I don't get pci.ids (that one should come from pciutils or directly from http://pciids.sourceforge.net/pci.ids)

- shouldn't the $(TARGET_DIR) be removed?

Note that these comments have nothing to do with the version bump, so
any changes should either go in a separate patch or be documented in the commit message (and extent the short message with 'and other fixes').

[snip]

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
#3 lore raw

PATCH 1/2 udev: bump to 177

Am 19.01.2012 15:22, schrieb Arnout Vandecappelle:

Quoted 5 lines · On Wednesday 18 January 2012 09:18:36 yegorslists at googlemail.com wrote:
Quoted 3 lines

From: Yegor Yefremov <[email protected]>

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

Thanks for reviewing.

Quoted 6 lines
Quoted 6 lines
---
 package/udev/Config.in |    9 ++++++++-
 package/udev/S10udev   |    2 +-
 package/udev/udev.mk   |   15 ++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)
Quoted 13 lines

package/udev/Config.in line 5

Quoted 10 lines
package/udev/Config.in +2 -0
index 391c718..e793496 100644
@@ -1,6 +1,9 @@
 config BR2_PACKAGE_UDEV
 	bool "udev"
 	depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
+	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_USBUTILS

Are these dependencies really required now? They're kind of
silly if you don't have e2fs or USB on your target system...

At least with the same config options they are required. I haven't found any option to disable these dependencies.

Quoted 2 lines

If they are required now, can you add a comment about it to the
commit message?

ACK

Quoted 8 lines
Quoted 8 lines
package/udev/Config.in +1 -0
+	select BR2_PACKAGE_KMOD
 	help
 	  Userspace device daemon.
 

@@ -8,6 +11,11 @@ config BR2_PACKAGE_UDEV
 
 if BR2_PACKAGE_UDEV
Quoted 7 lines

package/udev/Config.in config BR2_PACKAGE_UDEV · line 18

Quoted 5 lines
package/udev/Config.in +5 -0
+config BR2_PACKAGE_UDEV_RULES_GEN
+	bool "enable rules generator"
+	help
+	  Enable persistant rules generator
+

Also please mention this option in the commit message.

ACK

Quoted 20 lines

[snip]

Quoted 18 lines
package/udev/udev.mk +2 -1
index 1825396..395899a 100644
@@ -3,7 +3,7 @@
 # udev
 #
 #############################################################
-UDEV_VERSION = 173
+UDEV_VERSION = 177
 UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
 UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 UDEV_INSTALL_STAGING = YES

@@ -12,15 +12,20 @@ UDEV_CONF_OPT =			\
 	--sbindir=/sbin		\
 	--with-rootlibdir=/lib	\
 	--libexecdir=/lib/udev	\
+	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
Quoted 8 lines

package/udev/udev.mk UDEV_CONF_OPT = \ · line 16

Quoted 1 line
package/udev/udev.mk +1 -0
+	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\

I haven't actually ran it, but:

- I have the usb.ids in /usr/share/usb.ids

- I don't get pci.ids (that one should come from pciutils or directly from http://pciids.sourceforge.net/pci.ids)

You're right. I have over reacted, as I've seen that udev can't find usb.ids (usbutils dependency). hwdata is responsible for pci.ids, so I'll move it to extras case.

Quoted 1 line

- shouldn't the $(TARGET_DIR) be removed?

What do you mean? Why removing $(TARGET_DIR)?

Quoted 3 lines

Note that these comments have nothing to do with the version bump, so
any changes should either go in a separate patch or be documented in the commit message (and extent the short message with 'and other fixes').

I'll include all the issues in my next commit message. All these changes are "bump related".

Best regards,
Yegor

#4 lore raw

PATCH 1/2 udev: bump to 177

Quoted 2 lines · On Friday 20 January 2012 08:49:16 Yegor Yefremov wrote:

Am 19.01.2012 15:22, schrieb Arnout Vandecappelle:

Quoted 1 line · On Wednesday 18 January 2012 09:18:36 yegorslists at googlemail.com wrote:

[snip]

Quoted 7 lines
Quoted 5 lines

package/udev/Config.in line 5

Quoted 2 lines
package/udev/Config.in +2 -0
+	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_USBUTILS

Are these dependencies really required now? They're kind of
silly if you don't have e2fs or USB on your target system...

At least with the same config options they are required. I haven't found any option to disable these dependencies.

Okay, I looked at it in more detail...

- e2fsprogs is only needed for libblkid. You can get that from util-linux too, and that one is way smaller (plus it defaults to leaving out everything except libblkid and libuuid). Actually e2fsprogs is a nice example. Note BTW that util-linux depends on LARGEFILE and WCHAR, so these dependencies (+ the comment) should be added to the udev config as well - and therefore also to BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV.

- usbutils is only needed for the usb.ids. Giving the --with-usb-ids-path removes the dependency.

[snip]

Quoted 1 line
Quoted 1 line
Quoted 1 line

--libexecdir=/lib/udev \

I didn't notice before, but this dumps the udev stuff into /lib/udev/udev/
which I don't think is your intention. It should be --libexecdir=/lib

Quoted 8 lines
Quoted 8 lines

package/udev/udev.mk UDEV_CONF_OPT = \

Quoted 3 lines
package/udev/udev.mk +2 -0
+	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
 
+	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids	\

I haven't actually ran it, but:

- I have the usb.ids in /usr/share/usb.ids

Quoted 8 lines
Quoted 2 lines

- I don't get pci.ids (that one should come from pciutils or directly from http://pciids.sourceforge.net/pci.ids)

You're right. I have over reacted, as I've seen that udev can't find usb.ids (usbutils dependency). hwdata is responsible for pci.ids, so I'll move it to extras case.

Quoted 1 line

- shouldn't the $(TARGET_DIR) be removed?

What do you mean? Why removing $(TARGET_DIR)?

I should have explained that better. The path is only used in a C file
that will be executed on the target (configure doesn't actually check the validity of the path). So your linked udevd will have something like

$ strings -a target/lib/udev/udev/udevd | grep hwdata
/home/arnout/src/buildroot/output-ext-toolchain-x86_64/target/usr/share/hwdata/pci.ids
/home/arnout/src/buildroot/output-ext-toolchain-x86_64/target/usr/share/hwdata/usb.ids
Clearly, on my targe there is no /home/arnout directory.
Quoted 5 lines
Quoted 3 lines

Note that these comments have nothing to do with the version bump, so
any changes should either go in a separate patch or be documented in the commit message (and extent the short message with 'and other fixes').

I'll include all the issues in my next commit message. All these changes are "bump related".

With "these comments" I meant the incorrect hwdata and the $(TARGET_DIR),
which were already there in the previous version (and thus were bugs).

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