Skip to contentSkip to conversation

udev: bump to 172

PATCH Superseded Yegor Yefremov 3 participants 8 messages Jul 13, 2011 – Jul 19, 2011

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 udev: bump to 172

---
 package/udev/Config.in            |   42 ++---------
 package/udev/libvolume_id.la.tmpl |   35 ---------
 package/udev/udev.mk              |  144 ++++++--------------------------------
 3 files changed, 33 insertions(+), 188 deletions(-)
 delete mode 100644 package/udev/libvolume_id.la.tmpl
package/udev/Config.in +10 -32
Index: b/package/udev/Config.in
===================================================================
@@ -5,37 +5,15 @@
 
 	  ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 
-config BR2_PACKAGE_UDEV_UTILS
-	bool "udev-utils"
+config BR2_PACKAGE_UDEV_ALL_EXTRAS
+	bool "enable all extras"
 	depends on BR2_PACKAGE_UDEV
+	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
-	  Adds the udevmonitor, udevinfo, and udevtest binaries
-	  to your filesystem.
-
-menu "Extra udev tools"
-	depends on BR2_PACKAGE_UDEV
-
-config BR2_PACKAGE_UDEV_VOLUME_ID
-	bool "udev-libvolume_id"
-	depends on BR2_PACKAGE_UDEV
-	help
-	  Build and install volume identification library.
-
-config BR2_PACKAGE_UDEV_SCSI_ID
-	bool "udev-scsi_id"
-	depends on BR2_PACKAGE_UDEV_VOLUME_ID
-	help
-	  Build and install SCSI disk identification library.
-
-config BR2_PACKAGE_UDEV_PATH_ID
-	bool "udev-path_id"
-	depends on BR2_PACKAGE_UDEV_VOLUME_ID
-	help
-	  Install udev's unique device path generation program path_id.
-
-config BR2_PACKAGE_UDEV_FIRMWARE_SH
-	bool "udev-firmware_sh"
-	depends on BR2_PACKAGE_UDEV_VOLUME_ID
-	help
-	  Install udev's firmware loading script firmware.sh.
-endmenu
+	  Enable all extras with external dependencies like
+	  libacl, libusb, libusb-compat, usbutils, hwdata
package/udev/libvolume_id.la.tmpl deleted +0 -35
Index: b/package/udev/libvolume_id.la.tmpl
===================================================================
@@ -1,35 +0,0 @@
-# libvolume_id.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libvolume_id.so.REPLACE_CURRENT'
-
-# Names of this library.
-library_names='libvolume_id.so.REPLACE_CURRENT.REPLACE_AGE.REPLACE_REVISION libvolume_id.so.REPLACE_CURRENT libvolume_id.so'
-
-# The name of the static archive.
-old_library='libvolume_id.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lc'
-
-# Version information for libvolume_id.
-current=REPLACE_CURRENT
-age=REPLACE_AGE
-revision=REPLACE_REVISION
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='REPLACE_LIB_DIR'
package/udev/udev.mk +23 -121

155 lines not on this page · raw message

#1 lore raw

PATCH v3 1/1 udev: bump to 172

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yegor" == Yegor Yefremov <[email protected]> writes:

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

Thanks, a few comments:

Yegor> ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/

Yegor> -config BR2_PACKAGE_UDEV_UTILS
Yegor> - bool "udev-utils"
Yegor> +config BR2_PACKAGE_UDEV_ALL_EXTRAS
Yegor> + bool "enable all extras"
Yegor> depends on BR2_PACKAGE_UDEV
Yegor> + select BR2_PACKAGE_ACL
Yegor> + select BR2_PACKAGE_LIBUSB
Yegor> + select BR2_PACKAGE_LIBUSB_COMPAT
Yegor> + select BR2_PACKAGE_USBUTILS
Yegor> + select BR2_PACKAGE_HWDATA
Yegor> + select BR2_PACKAGE_LIBGLIB2

ACL and LIBGLIB2 have extra dependencies, so you need to depend on LARGEFILE and USE_WCHAR and show a comment line if those are not available - Something like:

comment "extras requires a toolchain with LARGEFILE + WCHAR support"

	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)

Yegor> -config BR2_PACKAGE_UDEV_VOLUME_ID
Yegor> - bool "udev-libvolume_id"
Yegor> - depends on BR2_PACKAGE_UDEV
Yegor> - help
Yegor> - Build and install volume identification library.

We have packages depending on this:

git grep UDEV_VOLUME

hal/Config.in:  select BR2_PACKAGE_UDEV_VOLUME_ID
usbmount/Config.in:     select BR2_PACKAGE_UDEV_VOLUME_ID

What are we going to do about those?

Yegor> -UDEV_BUILD_EXTRAS=$(addprefix extras/,$(UDEV_EXTRAS))
Yegor> +UDEV_CONF_OPT = \
Yegor> + --exec-prefix= \

This gives a bit odd locations, like the pkgconfig files ending up in /lib/pkgconfig where we're not searching for it. The Debian package uses

--sbindir=/sbin --with-rootlibdir=/lib

Which might be a better option.

Yegor> +ifneq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)

I don't like negative logic, please invert the test (and the 2 cases).

Yegor> + UDEV_CONF_OPT += \
Yegor> + --disable-hwdb \

You have a few spaces here in front instead of tabs.

Yegor> + --disable-udev_acl \
Yegor> + --disable-gudev
Yegor> +else

 Yegor> +    UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
 Yegor> +    UDEV_CONF_OPT += 							\
 Yegor> +    	PKG_CONFIG_PATH=$(STAGING_DIR)/usr/share/pkgconfig 		\

Why do you need to set this?

Otherwise it looks good.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH v3 1/1 udev: bump to 172

Le Fri, 15 Jul 2011 20:49:21 +0200,
Peter Korsgaard <[email protected]> a ?crit :

Quoted 8 lines

Yegor> + --disable-udev_acl \
Yegor> + --disable-gudev
Yegor> +else

 Yegor> +    UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
 Yegor> +    UDEV_CONF_OPT += 							\
 Yegor> +    	PKG_CONFIG_PATH=$(STAGING_DIR)/usr/share/pkgconfig 		\

Why do you need to set this?

I think because usr/share/pkgconfig is not in the default pkg-config search path, and things like hwdata install their .pc file in usr/share/pkgconfig. At least, that's what I remember from the time I did a modern udev package in Buildroot (stuff that I lost when my laptop got stolen...).

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH v3 1/1 udev: bump to 172

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Yegor> + PKG_CONFIG_PATH=$(STAGING_DIR)/usr/share/pkgconfig \

Quoted 2 lines
Quoted 2 lines

Why do you need to set this?

Thomas> I think because usr/share/pkgconfig is not in the default pkg-config Thomas> search path, and things like hwdata install their .pc file in Thomas> usr/share/pkgconfig. At least, that's what I remember from the time I Thomas> did a modern udev package in Buildroot (stuff that I lost when my Thomas> laptop got stolen...).

But it is as we build pkg-config with:

--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig"

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH v3 1/1 udev: bump to 172

Le Mon, 18 Jul 2011 09:52:03 +0200,
Peter Korsgaard <[email protected]> a ?crit :

Quoted 3 lines

But it is as we build pkg-config with:

--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig"

It wasn't at the time I did my udev package (which I lost), and maybe the same is true for Yegor's package. Yegor, can you retry without this PKG_CONFIG_PATH variable ?

Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#5 lore raw

PATCH v3 1/1 udev: bump to 172

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Quoted 3 lines
Quoted 3 lines

But it is as we build pkg-config with:

--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig"

Thomas> It wasn't at the time I did my udev package (which I lost), and Thomas> maybe the same is true for Yegor's package. Yegor, can you Thomas> retry without this PKG_CONFIG_PATH variable ?

Please also take my other comments into considerations when respinning the patch.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH v3 1/1 udev: bump to 172

Am 18.07.2011 21:14, schrieb Peter Korsgaard:

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Quoted 2 lines
Quoted 2 lines

But it is as we build pkg-config with:

Quoted 8 lines
Quoted 1 line
Quoted 1 line

--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig"

Thomas> It wasn't at the time I did my udev package (which I lost), and Thomas> maybe the same is true for Yegor's package. Yegor, can you Thomas> retry without this PKG_CONFIG_PATH variable ?

Please also take my other comments into considerations when respinning the patch.

I've followed all your comments except of dependencies with volume id (see v4).

Yegor

#7 lore raw

PATCH v3 1/1 udev: bump to 172

In reply to Thomas Petazzoni

Am 18.07.2011 18:07, schrieb Thomas Petazzoni:

Quoted 10 lines

Le Mon, 18 Jul 2011 09:52:03 +0200,
Peter Korsgaard <[email protected]> a ?crit :

Quoted 3 lines

But it is as we build pkg-config with:

--with-pc-path="$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig"

It wasn't at the time I did my udev package (which I lost), and maybe the same is true for Yegor's package. Yegor, can you retry without this PKG_CONFIG_PATH variable ?

Yes, I could compile without this variable.

Yegor