[Buildroot] [PATCHv3] udev: bump to 172

[Buildroot] [PATCHv3] udev: bump to 172

[Yegor Yefremov]

Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
 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

Index: b/package/udev/Config.in
===================================================================
--- a/package/udev/Config.in
+++ 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
Index: b/package/udev/libvolume_id.la.tmpl
===================================================================
--- a/package/udev/libvolume_id.la.tmpl
+++ /dev/null
@@ -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'
Index: b/package/udev/udev.mk
===================================================================
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -3,132 +3,34 @@
 # udev
 #
 #############################################################
-UDEV_VERSION:=114
-UDEV_VOLUME_ID_CURRENT:=0
-UDEV_VOLUME_ID_AGE:=79
-UDEV_VOLUME_ID_REVISION:=0
-UDEV_VOLUME_ID_VERSION:=$(UDEV_VOLUME_ID_CURRENT).$(UDEV_VOLUME_ID_AGE).$(UDEV_VOLUME_ID_REVISION)
-UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
-UDEV_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
-UDEV_INSTALL_STAGING=YES
-
-# 094 had _GNU_SOURCE set
-BR2_UDEV_CFLAGS:= -D_GNU_SOURCE $(TARGET_CFLAGS)
-ifeq ($(BR2_LARGEFILE),)
-BR2_UDEV_CFLAGS+=-U_FILE_OFFSET_BITS
-endif
-
-# UDEV_ROOT is /dev so we can replace devfs, not /udev for experiments
-UDEV_ROOT:=/dev
-
-UDEV_EXTRAS=
-ifeq ($(BR2_PACKAGE_UDEV_VOLUME_ID),y)
-UDEV_EXTRAS+=volume_id
-endif
-ifeq ($(BR2_PACKAGE_UDEV_SCSI_ID),y)
-UDEV_EXTRAS+=scsi_id
-UDEV_EXTRAS+=usb_id
-endif
-ifeq ($(BR2_PACKAGE_UDEV_PATH_ID),y)
-UDEV_EXTRAS+=path_id
-endif
-ifeq ($(BR2_PACKAGE_UDEV_FIRMWARE_SH),y)
-UDEV_EXTRAS+=firmware
-endif
+UDEV_VERSION = 172
+UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
+UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
 
-UDEV_BUILD_EXTRAS=$(addprefix extras/,$(UDEV_EXTRAS))
+UDEV_CONF_OPT = 		\
+	--exec-prefix=  	\
+	--libexecdir=/lib/udev 	\
+	--disable-introspection
 
-#
-# Build
-#
-define UDEV_BUILD_CMDS
-	$(MAKE) CROSS_COMPILE=$(TARGET_CROSS) CC="$(TARGET_CC)" LD="$(TARGET_CC)"\
-		CFLAGS="$(BR2_UDEV_CFLAGS)" \
-		USE_LOG=false USE_SELINUX=false \
-		udevdir=$(UDEV_ROOT) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D)
-endef
+UDEV_DEPENDENCIES = host-gperf
 
-#
-# Staging installation
-#
-ifeq ($(BR2_PACKAGE_UDEV_VOLUME_ID),y)
-define UDEV_VOLUME_ID_STAGING_INSTALL_CMDS
-	$(INSTALL) -m 0644 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.h $(STAGING_DIR)/usr/include/libvolume_id.h
-	$(INSTALL) -m 0755 -D $(UDEV_DIR)/extras/volume_id/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so.$(UDEV_VOLUME_ID_VERSION)
-	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so.0
-	-ln -sf libvolume_id.so.$(UDEV_VOLUME_ID_VERSION) $(STAGING_DIR)/lib/libvolume_id.so
-	$(INSTALL) -m 0755 -D package/udev/libvolume_id.la.tmpl $(STAGING_DIR)/lib/libvolume_id.la
-	$(SED) 's/REPLACE_CURRENT/$(UDEV_VOLUME_ID_CURRENT)/g' $(STAGING_DIR)/lib/libvolume_id.la
-	$(SED) 's/REPLACE_AGE/$(UDEV_VOLUME_ID_AGE)/g' $(STAGING_DIR)/lib/libvolume_id.la
-	$(SED) 's/REPLACE_REVISION/$(UDEV_VOLUME_ID_REVISION)/g' $(STAGING_DIR)/lib/libvolume_id.la
-	$(SED) 's,REPLACE_LIB_DIR,$(STAGING_DIR)/usr/lib,g' $(STAGING_DIR)/lib/libvolume_id.la
-endef
+ifneq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)
+    UDEV_CONF_OPT += 		\
+    	--disable-hwdb		\
+	--disable-udev_acl	\
+	--disable-gudev
+else
+    UDEV_DEPENDENCIES += libusb libusb-compat acl usbutils hwdata libglib2
+    UDEV_CONF_OPT += 							\
+    	PKG_CONFIG_PATH=$(STAGING_DIR)/usr/share/pkgconfig 		\
+    	--with-pci-ids-path=$(TARGET_DIR)/usr/share/hwdata/pci.ids	\
+    	--with-usb-ids-path=$(TARGET_DIR)/usr/share/hwdata/usb.ids
 endif
 
-define UDEV_INSTALL_STAGING_CMDS
-$(UDEV_VOLUME_ID_STAGING_INSTALL_CMDS)
+define UDEV_INSTALL_INITSCRIPT
+    $(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
 endef
 
-#
-# Target installation
-#
-ifneq ($(BR2_PACKAGE_UDEV_UTILS),y)
-define UDEV_UTILS_REMOVAL
-	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor
-	rm -f $(TARGET_DIR)/usr/bin/udevinfo
-	rm -f $(TARGET_DIR)/usr/bin/udevtest
-endef
-endif
-
-define UDEV_INSTALL_TARGET_CMDS
-	mkdir -p $(TARGET_DIR)/sys
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		DESTDIR=$(TARGET_DIR) \
-		CFLAGS="$(BR2_UDEV_CFLAGS)" \
-		LDFLAGS="-warn-common" \
-		USE_LOG=false USE_SELINUX=false \
-		udevdir=$(UDEV_ROOT) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D) install
-	$(INSTALL) -m 0755 -D package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
-	$(INSTALL) -m 0755 -d $(TARGET_DIR)/etc/udev/rules.d
-	$(INSTALL) -m 0644 $(@D)/etc/udev/frugalware/* $(TARGET_DIR)/etc/udev/rules.d
-	( grep udev_root $(TARGET_DIR)/etc/udev/udev.conf > /dev/null 2>&1 || echo 'udev_root=/dev' >> $(TARGET_DIR)/etc/udev/udev.conf )
-	install -m 0755 -D $(@D)/udevstart $(TARGET_DIR)/sbin/udevstart
-	for i in $(TARGET_DIR)/sbin/udev* $(TARGET_DIR)/usr/bin/udev* ; do \
-		$(STRIPCMD) $(STRIP_STRIP_ALL) $$i ; \
-	done
-	for i in scsi_id usb_id vol_id ; do \
-		if test -e $(TARGET_DIR)/lib/udev/$$i ; then \
-			$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/lib/udev/$$i ; \
-		fi \
-	done
-	$(UDEV_UTILS_REMOVAL)
-endef
-
-#
-# Clean
-#
-define UDEV_CLEAN_CMDS
-	-$(MAKE) EXTRAS="$(UDEV_BUILD_EXTRAS)" -C $(@D) clean
-endef
-
-#
-# Staging uninstall
-#
-define UDEV_UNINSTALL_STAGING_CMDS
-	rm -f $(STAGING_DIR)/usr/include/libvolume_id.h
-	rm -f $(STAGING_DIR)/lib/libvolume_id.so*
-	rm -f $(STAGING_DIR)/lib/libvolume_id.la
-endef
-
-#
-# Target uninstall
-#
-define UDEV_UNINSTALL_TARGET_CMDS
-	rm -f $(TARGET_DIR)/etc/init.d/S10udev $(TARGET_DIR)/sbin/udev*
-	rm -f $(TARGET_DIR)/usr/sbin/udevmonitor $(TARGET_DIR)/usr/bin/udev*
-	rm -fr $(TARGET_DIR)/sys
-	rm -f $(TARGET_DIR)/lib/libvolume_id.so.0*
-	rm -rf $(TARGET_DIR)/lib/udev
-endef
+UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT
 
-$(eval $(call GENTARGETS,package,udev))
+$(eval $(call AUTOTARGETS,package,udev))

[Buildroot] [PATCHv3] udev: bump to 172

[Peter Korsgaard]

>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:

 Yegor> Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
 Yegor> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>

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.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCHv3] udev: bump to 172

[Thomas Petazzoni]

Le Fri, 15 Jul 2011 20:49:21 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

>  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
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCHv3] udev: bump to 172

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 Yegor> +    	PKG_CONFIG_PATH=$(STAGING_DIR)/usr/share/pkgconfig 		\
 >> 
 >> 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"

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCHv3] udev: bump to 172

[Thomas Petazzoni]

Le Mon, 18 Jul 2011 09:52:03 +0200,
Peter Korsgaard <jacmet@uclibc.org> a ?crit :

> 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
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCHv3] udev: bump to 172

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 >> 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.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCHv3] udev: bump to 172

[Yegor Yefremov]

Am 18.07.2011 18:07, schrieb Thomas Petazzoni:
> Le Mon, 18 Jul 2011 09:52:03 +0200,
> Peter Korsgaard <jacmet@uclibc.org> a ?crit :
> 
>> 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

[Buildroot] [PATCHv3] udev: bump to 172

[Yegor Yefremov]

Am 18.07.2011 21:14, schrieb Peter Korsgaard:
>>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> 
> Hi,
> 
>  >> 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.

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

Yegor