[Buildroot] [PATCH] udev: bump version to 164 and add optional support for all extras

Heiko Zuerker heiko at zuerker.org
Tue Dec 7 19:16:30 UTC 2010


I did it again ... (forgot to clean up my comments).
I'll be sending in a new patch.

Heiko

Quoting heiko at zuerker.org:

> From: Heiko Zuerker <smiley73 at users.sourceforge.net>
>
>
> Signed-off-by: Heiko Zuerker <smiley73 at users.sourceforge.net>
> ---
>  package/udev/Config.in            |   39 ++---------
>  package/udev/libvolume_id.la.tmpl |   35 ----------
>  package/udev/udev.mk              |  136  
> +++++--------------------------------
>  3 files changed, 25 insertions(+), 185 deletions(-)
>  delete mode 100644 package/udev/libvolume_id.la.tmpl
>
> diff --git a/package/udev/Config.in b/package/udev/Config.in
> index 6438d4f..2c76cc7 100644
> --- a/package/udev/Config.in
> +++ b/package/udev/Config.in
> @@ -5,37 +5,12 @@ config BR2_PACKAGE_UDEV
>
>  	  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
> diff --git a/package/udev/libvolume_id.la.tmpl  
> b/package/udev/libvolume_id.la.tmpl
> deleted file mode 100644
> index 725628b..0000000
> --- 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'
> diff --git a/package/udev/udev.mk b/package/udev/udev.mk
> index 90dbdce..6d3f28a 100644
> --- a/package/udev/udev.mk
> +++ b/package/udev/udev.mk
> @@ -3,131 +3,31 @@
>  # 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_VERSION:=164
>  UDEV_SOURCE:=udev-$(UDEV_VERSION).tar.bz2
>  UDEV_SITE:=$(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/
> -UDEV_INSTALL_STAGING=YES
> +#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
> +UDEV_CONF_OPT=--exec-prefix= --libexecdir=/lib/udev --disable-introspection
>
> -#
> -# 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
> +ifneq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y)
> +    UDEV_CONF_OPT+=--disable-extras
> +else
> +    UDEV_DEPENDENCIES=libusb libusb-compat acl usbutils hwdata
> +    #UDEV_CONF_OPT=USBUTILS_LIBS=$(STAGING_DIR)/usr/lib
> +     
> UDEV_CONF_OPT+=PKG_CONFIG_PATH=$(STAGING_DIR)/usr/share/pkgconfig  
> --with-pci-ids-path=/usr/share/hwdata/pci.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 package/udev/S10udev $(TARGET_DIR)/etc/init.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
> +#ATK_CONF_ENV = ac_cv_file__usr_share_hwdata_pci_ids=yes
> +#ifeq ($(BR2_PACKAGE_HWDATA),y)
> +#    UDEV_CONF_OPT+=--with-pci-ids-path==/usr/share/hwdata/pci.ids  
> --with-usb-ids-path==/usr/share/hwdata/usb.ids
> +#UDEV_CONF_OPT+=--with-pci-ids-path=/usr/share/hwdata
> +#endif
>
> -#
> -# 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
> +define UDEV_INSTALL_INITSCRIPT
> +    $(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
>  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))
> --
> 1.7.3.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>



-- 

Regards
   Heiko Zuerker
   http://www.devil-linux.org


----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.




More information about the buildroot mailing list