[Buildroot] [PATCHv4] udev: bump to 172

[Buildroot] [PATCHv4] 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            |   43 +++--------
 package/udev/libvolume_id.la.tmpl |   35 ---------
 package/udev/udev.mk              |  144 ++++++--------------------------------
 3 files changed, 35 insertions(+), 187 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,18 @@
 
 	  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.
+	  Enable all extras with external dependencies like
+	  libacl, libusb, libusb-compat, usbutils, hwdata
 
-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
+comment "extras requires a toolchain with LARGEFILE + WCHAR support"
+	depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
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 =			\
+	--sbindir=/sbin		\
+	--with-rootlibdir=/lib	\
+	--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
+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
+else
+UDEV_CONF_OPT +=		\
+	--disable-hwdb		\
+	--disable-udev_acl	\
+	--disable-gudev
 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] [PATCHv4] 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 - It would be good if you in the future could list (after the ---
line so it doesn't become part of the commit message) what you have
changed since the previous version.

From a quick look, I think the only pending issue is about the
UDEV_VOLUME_ID dependencies of usbmount/hal. What do we do about those?
I don't know much about udev/hal/usbmount, but presumably there's a way
forward here?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCHv4] udev: bump to 172

[Yegor Yefremov]

Am 19.07.2011 12:21, schrieb 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 - It would be good if you in the future could list (after the ---
> line so it doesn't become part of the commit message) what you have
> changed since the previous version.
>
> >From a quick look, I think the only pending issue is about the
> UDEV_VOLUME_ID dependencies of usbmount/hal. What do we do about those?
> I don't know much about udev/hal/usbmount, but presumably there's a way
> forward here?

It seems to become a lot of work :-) At first see here: http://www.mail-archive.com/lfs-dev at linuxfromscratch.org/msg13353.html

AFAIK vol_id stuff is now in util-linux-ng. This package in BR is rather out-of-date. That is the first TODO.

The new version of usbmount is not using vol_id any longer (0.0.19). But it would be tricky to update it. I can see all files in websvn http://anonscm.debian.org/viewvc/usbmount/usbmount/trunk/, but I cannot checkout the repository and this new version is not published, so one could download the archive file. That is the second TODO.

HAL is the third one.

Yegor

[Buildroot] [PATCHv4] udev: bump to 172

[Yegor Yefremov]

> The new version of usbmount is not using vol_id any longer (0.0.19). But it would be tricky to update it. I can see all files in websvn http://anonscm.debian.org/viewvc/usbmount/usbmount/trunk/, but I cannot checkout the repository and this new version is not published, so one could download the archive file. That is the second TODO.

http://packages.debian.org/source/stable/usbmount. I'll look at it.

Yegor

[Buildroot] [PATCHv4] udev: bump to 172

[Peter Korsgaard]

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

Hi,

 >> >From a quick look, I think the only pending issue is about the
 >> UDEV_VOLUME_ID dependencies of usbmount/hal. What do we do about those?
 >> I don't know much about udev/hal/usbmount, but presumably there's a way
 >> forward here?

 Yegor> It seems to become a lot of work :-)

Yes, I know - Sorry about that. On the other hand, I cannot break the
build for the existing users of hal/usbmount.

Thanks for the links, will take a look.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCHv4] udev: bump to 172

[Yegor Yefremov]

>  >> >From a quick look, I think the only pending issue is about the
>  >> UDEV_VOLUME_ID dependencies of usbmount/hal. What do we do about those?
>  >> I don't know much about udev/hal/usbmount, but presumably there's a way
>  >> forward here?
>
>  Yegor> It seems to become a lot of work :-)
>
> Yes, I know - Sorry about that. On the other hand, I cannot break the
> build for the existing users of hal/usbmount.

Never mind :-)

> Thanks for the links, will take a look


I looked at the latest usbmount 0.0.21 package hosted by Debian. It uses blkid, which is part of util-linux and busybox. The busybox one is not capable of delivering the needed info about partitions, so we really need util-linux. The present package is rather old and didn't want to get compiled. At first the package needs to be converted to autotarget and bumped to the newer version, which in turn seems to have issues with uclibc: http://permalink.gmane.org/gmane.comp.embedded.ptxdist.devel/7547.

That's my preliminary summary.

Yegor

[Buildroot] [PATCHv4] udev: bump to 172

[Thomas Petazzoni]

Le Tue, 19 Jul 2011 16:51:51 +0200,
Yegor Yefremov <yegor_sub1@visionsystems.de> a ?crit :

> I looked at the latest usbmount 0.0.21 package hosted by Debian. It
> uses blkid, which is part of util-linux and busybox. The busybox one
> is not capable of delivering the needed info about partitions, so we
> really need util-linux. The present package is rather old and didn't
> want to get compiled. At first the package needs to be converted to
> autotarget and bumped to the newer version, which in turn seems to
> have issues with uclibc:
> http://permalink.gmane.org/gmane.comp.embedded.ptxdist.devel/7547.

For util-linux, multiple patches have been posted to the list to update
it, but none have been merged. So I think looking at the archives of
the Buildroot list would be a good starting point.

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCHv4] udev: bump to 172

[Yegor Yefremov]

Am 19.07.2011 18:47, schrieb Thomas Petazzoni:
> Le Tue, 19 Jul 2011 16:51:51 +0200,
> Yegor Yefremov <yegor_sub1@visionsystems.de> a ?crit :
>
>> I looked at the latest usbmount 0.0.21 package hosted by Debian. It
>> uses blkid, which is part of util-linux and busybox. The busybox one
>> is not capable of delivering the needed info about partitions, so we
>> really need util-linux. The present package is rather old and didn't
>> want to get compiled. At first the package needs to be converted to
>> autotarget and bumped to the newer version, which in turn seems to
>> have issues with uclibc:
>> http://permalink.gmane.org/gmane.comp.embedded.ptxdist.devel/7547.
> For util-linux, multiple patches have been posted to the list to update
> it, but none have been merged. So I think looking at the archives of
> the Buildroot list would be a good starting point.

Have found one, seems to compile after applying the uclibc patch.

Yegor

[Buildroot] [PATCHv4] udev: bump to 172

[Yegor Yefremov]

Am 19.07.2011 12:50, schrieb Peter Korsgaard:
>>>>>> "Yegor" == Yegor Yefremov <yegor_sub1@visionsystems.de> writes:
> Hi,
>
>  >> >From a quick look, I think the only pending issue is about the
>  >> UDEV_VOLUME_ID dependencies of usbmount/hal. What do we do about those?
>  >> I don't know much about udev/hal/usbmount, but presumably there's a way
>  >> forward here?
>
>  Yegor> It seems to become a lot of work :-)
>
> Yes, I know - Sorry about that. On the other hand, I cannot break the
> build for the existing users of hal/usbmount

So I looked at usbmount stuff. As far as I understand it is not working. See this thread: http://lists.busybox.net/pipermail/buildroot/2011-April/042454.html

The usbmount.mk file is not installing the usbmount.rules file, so udev knows nothing about this script. I bumped the package to the newest version and instructed the installer to put rules files to /lib/udev/rules.d/ but still it is not working. I'm not the biggest udev expert yet, so if someone could take a look at the patch I will send, it would really help. The package itself should depend on util-linux, so it has nothing to do with volume_id any more.

Because of this and the fact, that hal is deprecated in favor of udev, udev can bumped now. What do you think about it?

Best regards,
Yegor

[Buildroot] [PATCHv4] udev: bump to 172

[Thomas Petazzoni]

Le Tue, 19 Jul 2011 12:47:06 +0200,
Yegor Yefremov <yegor_sub1@visionsystems.de> a ?crit :

> HAL is the third one.

HAL is deprecated, just remove the package.

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com