Commit 7d925ffc authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Thomas Petazzoni
Browse files

usbutils: bump to version 008 



Now uses hwdb from libudev for usb information.
Drop all redundant/obsolete dependencies and cleanup hooks.
Don't install to staging, it's pointless, it provides no libraries at
all and it doesn't bundle usb.ids any more.

[Thomas: change 'comment' in Config.in to match what's recommended in
the Buildroot manual.]

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 301102e1

package/usbutils/Config.in

+3 −15
Original line number Diff line number Diff line 
config BR2_PACKAGE_USBUTILS

	bool "usbutils"

	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb

	depends on BR2_PACKAGE_HAS_UDEV # needs hwdb

	select BR2_PACKAGE_LIBUSB

	help

	  USB enumeration utilities



	  http://linux-usb.sourceforge.net/



if BR2_PACKAGE_USBUTILS



config BR2_PACKAGE_USBUTILS_ZLIB

	bool "compressed data support"

	select BR2_PACKAGE_ZLIB

	help

	  Enable use of zlib for a compressed usb.ids.gz

	  This makes the data file smaller if you're not using a compressed

	  filesystem, but it also makes lsusb slower since it has

	  to decompress the file every time it's run.



endif



comment "usbutils needs a toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
comment "usbutils needs needs udev /dev management and toolchain w/ threads"

	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV

package/usbutils/usbutils.hash

+1 −1
Original line number Diff line number Diff line 
# From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc

sha256	7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4	usbutils-007.tar.xz
 
sha256	44741af0bae9d402a0ef160a29b2fa700bb656ab5e0a4b3343d51249c2a44c8c	usbutils-008.tar.xz

package/usbutils/usbutils.mk

+2 −31
Original line number Diff line number Diff line
@@ -4,20 +4,13 @@ 
#

################################################################################



USBUTILS_VERSION = 007

USBUTILS_VERSION = 008

USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz

USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils

USBUTILS_DEPENDENCIES = host-pkgconf libusb

USBUTILS_INSTALL_STAGING = YES

USBUTILS_DEPENDENCIES = host-pkgconf libusb udev

USBUTILS_LICENSE = GPLv2+

USBUTILS_LICENSE_FILES = COPYING



ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)

	USBUTILS_DEPENDENCIES += zlib

else

	USBUTILS_CONF_OPTS = --disable-zlib

endif



# Build after busybox since it's got a lightweight lsusb

ifeq ($(BR2_PACKAGE_BUSYBOX),y)

	USBUTILS_DEPENDENCIES += busybox
@@ -34,30 +27,8 @@ endif 


define USBUTILS_TARGET_CLEANUP

	rm -f $(TARGET_DIR)/usr/bin/usb-devices

	rm -f $(TARGET_DIR)/usr/sbin/update-usbids.sh

	rm -f $(TARGET_DIR)/usr/share/pkgconfig/usbutils.pc

endef



USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_TARGET_CLEANUP



define USBUTILS_REMOVE_UNCOMPRESSED_IDS

	rm -f $(TARGET_DIR)/usr/share/usb.ids

endef



define USBUTILS_REMOVE_COMPRESSED_IDS

	rm -f $(TARGET_DIR)/usr/share/usb.ids.gz

endef



ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)

USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_UNCOMPRESSED_IDS

else

USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_COMPRESSED_IDS

endif



define USBUTILS_REMOVE_DEVFILES

	rm -f $(TARGET_DIR)/usr/bin/libusb-config

endef



USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_DEVFILES



$(eval $(autotools-package))