* [Buildroot] [PATCH] udev: bump to 172
@ 2011-07-12 12:39 Yegor Yefremov
2011-07-12 13:47 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Yegor Yefremov @ 2011-07-12 12:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
package/udev/Config.in | 39 +--------
package/udev/libvolume_id.la.tmpl | 35 --------
package/udev/udev.mk | 150 ++++++--------------------------------
3 files changed, 32 insertions(+), 192 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,12 @@
ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
-config BR2_PACKAGE_UDEV_UTILS
- bool "udev-utils"
- depends on BR2_PACKAGE_UDEV
+config BR2_PACKAGE_UDEV_ALL_EXTRAS
+ bool "enable all extras"
+ depends on BR2_PACKAGE_UDEV && BR2_PACKAGE_ACL && BR2_PACKAGE_LIBUSB && BR2_PACKAGE_LIBUSB_COMPAT && BR2_PACKAGE_USBUTILS && BR2_PACKAGE_HWDATA
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 "some additional udev extras require acl and libusb to be built"
+ depends on !BR2_PACKAGE_ACL || !BR2_PACKAGE_LIBUSB || !BR2_PACKAGE_LIBUSB_COMPAT || !BR2_PACKAGE_USBUTILS || !BR2_PACKAGE_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,32 @@
# 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_BUILD_EXTRAS=$(addprefix extras/,$(UDEV_EXTRAS))
-
-#
-# 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
-
-#
-# 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
-endif
-
-define UDEV_INSTALL_STAGING_CMDS
-$(UDEV_VOLUME_ID_STAGING_INSTALL_CMDS)
-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
+UDEV_VERSION = 172
+UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2
+UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
+
+UDEV_CONF_OPT = \
+ --exec-prefix= \
+ --libexecdir=/lib/udev \
+ --disable-introspection
+
+UDEV_DEPENDENCIES = host-gperf
+
+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
+ 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_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
+define UDEV_INSTALL_INITSCRIPT
+ $(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
endef
-$(eval $(call GENTARGETS,package,udev))
+$(eval $(call AUTOTARGETS,package,udev))
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] udev: bump to 172
2011-07-12 12:39 [Buildroot] [PATCH] udev: bump to 172 Yegor Yefremov
@ 2011-07-12 13:47 ` Thomas Petazzoni
2011-07-12 14:48 ` Yegor Yefremov
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2011-07-12 13:47 UTC (permalink / raw)
To: buildroot
Hello,
Thanks Yegor for this patch. It's really great to have a modern version
of udev in Buildroot.
Le Tue, 12 Jul 2011 14:39:12 +0200,
Yegor Yefremov <yegor_sub1@visionsystems.de> a ?crit :
> Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> package/udev/Config.in | 39 +--------
> package/udev/libvolume_id.la.tmpl | 35 --------
> package/udev/udev.mk | 150 ++++++--------------------------------
> 3 files changed, 32 insertions(+), 192 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,12 @@
>
> ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
>
> -config BR2_PACKAGE_UDEV_UTILS
> - bool "udev-utils"
> - depends on BR2_PACKAGE_UDEV
> +config BR2_PACKAGE_UDEV_ALL_EXTRAS
> + bool "enable all extras"
> + depends on BR2_PACKAGE_UDEV && BR2_PACKAGE_ACL && BR2_PACKAGE_LIBUSB && BR2_PACKAGE_LIBUSB_COMPAT && BR2_PACKAGE_USBUTILS && BR2_PACKAGE_HWDATA
I'm wondering whether we should turn this into :
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
Because all those dependencies are not really obvious.
> +comment "some additional udev extras require acl and libusb to be built"
> + depends on !BR2_PACKAGE_ACL || !BR2_PACKAGE_LIBUSB || !BR2_PACKAGE_LIBUSB_COMPAT || !BR2_PACKAGE_USBUTILS || !BR2_PACKAGE_HWDATA
The message does not match the dependencies: it doesn't say anything
about libusb-compat, usbutils and hwdata. But see above, I think
"select" style dependencies would be better.
I have tried building your package. Just udev itself works fine, but
udev with extras doesn't work, you forgot the libglib2 dependency :
checking for GLIB... no
configure: error: Package requirements (glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0) were not met:
No package 'glib-2.0' found
No package 'gobject-2.0' found
Regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] udev: bump to 172
2011-07-12 13:47 ` Thomas Petazzoni
@ 2011-07-12 14:48 ` Yegor Yefremov
2011-07-12 15:16 ` Heiko Zuerker
0 siblings, 1 reply; 4+ messages in thread
From: Yegor Yefremov @ 2011-07-12 14:48 UTC (permalink / raw)
To: buildroot
Am 12.07.2011 15:47, schrieb Thomas Petazzoni:
> Hello,
>
> Thanks Yegor for this patch. It's really great to have a modern version
> of udev in Buildroot.
At this place I would like to thank Heiko Zuerker for making the patch, I was basing mine on.
>> Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net>
>> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
>> ---
>> package/udev/Config.in | 39 +--------
>> package/udev/libvolume_id.la.tmpl | 35 --------
>> package/udev/udev.mk | 150 ++++++--------------------------------
>> 3 files changed, 32 insertions(+), 192 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,12 @@
>>
>> ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
>>
>> -config BR2_PACKAGE_UDEV_UTILS
>> - bool "udev-utils"
>> - depends on BR2_PACKAGE_UDEV
>> +config BR2_PACKAGE_UDEV_ALL_EXTRAS
>> + bool "enable all extras"
>> + depends on BR2_PACKAGE_UDEV && BR2_PACKAGE_ACL && BR2_PACKAGE_LIBUSB && BR2_PACKAGE_LIBUSB_COMPAT && BR2_PACKAGE_USBUTILS && BR2_PACKAGE_HWDATA
> I'm wondering whether we should turn this into :
>
> 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
>
> Because all those dependencies are not really obvious.
>
>> +comment "some additional udev extras require acl and libusb to be built"
>> + depends on !BR2_PACKAGE_ACL || !BR2_PACKAGE_LIBUSB || !BR2_PACKAGE_LIBUSB_COMPAT || !BR2_PACKAGE_USBUTILS || !BR2_PACKAGE_HWDATA
> The message does not match the dependencies: it doesn't say anything
> about libusb-compat, usbutils and hwdata. But see above, I think
> "select" style dependencies would be better.
So do I. Fixed.
> I have tried building your package. Just udev itself works fine, but
> udev with extras doesn't work, you forgot the libglib2 dependency :
>
> checking for GLIB... no
> configure: error: Package requirements (glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0) were not met:
> No package 'glib-2.0' found
> No package 'gobject-2.0' found
Fixed. I had glibc already activated because of some other package. As always :-)
Thanks for review.
Best regards,
Yegor
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] udev: bump to 172
2011-07-12 14:48 ` Yegor Yefremov
@ 2011-07-12 15:16 ` Heiko Zuerker
0 siblings, 0 replies; 4+ messages in thread
From: Heiko Zuerker @ 2011-07-12 15:16 UTC (permalink / raw)
To: buildroot
Quoting Yegor Yefremov <yegor_sub1@visionsystems.de>:
> Am 12.07.2011 15:47, schrieb Thomas Petazzoni:
>> Hello,
>>
>> Thanks Yegor for this patch. It's really great to have a modern version
>> of udev in Buildroot.
>
> At this place I would like to thank Heiko Zuerker for making the
> patch, I was basing mine on.
I'm just glad we're moving on it. I don't have much time lately to
keep these things going....
--
Regards
Heiko Zuerker
http://www.devil-linux.org
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-12 15:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-12 12:39 [Buildroot] [PATCH] udev: bump to 172 Yegor Yefremov
2011-07-12 13:47 ` Thomas Petazzoni
2011-07-12 14:48 ` Yegor Yefremov
2011-07-12 15:16 ` Heiko Zuerker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox