[ptxdist] [PATCH 2/7] usbutils: Version bump 007 -> 014.

[Christian Melki <christian.melki@t2data.com>]

Upgrade old usbutils.

Usbutils now depends on libudev, add it.

Clear out some old configure options.

Also, usb.ids are not supplied anymore,
but rather supplied by the hwdata package.
Thus remove usb.ids installation and
make usbutils depend on hwdata-usb files.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/usbutils.in   | 4 ++++
 rules/usbutils.make | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rules/usbutils.in b/rules/usbutils.in
index f259f9c4e..105bb078a 100644
--- a/rules/usbutils.in
+++ b/rules/usbutils.in
@@ -2,6 +2,10 @@
 
 menuconfig USBUTILS
 	select LIBUSB
+	select UDEV
+	select UDEV_LIBUDEV
+	select HWDATA		if !SYSTEMD_HWDB
+	select HWDATA_USB	if !SYSTEMD_HWDB
 	tristate
 	prompt "usbutils                      "
 	help
diff --git a/rules/usbutils.make b/rules/usbutils.make
index 80af5a2bb..d594652ec 100644
--- a/rules/usbutils.make
+++ b/rules/usbutils.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_USBUTILS) += usbutils
 #
 # Paths and names
 #
-USBUTILS_VERSION	:= 007
-USBUTILS_MD5		:= c9df5107ae9d26b10a1736a261250139
+USBUTILS_VERSION	:= 014
+USBUTILS_MD5		:= f21aa68ee7870b161921a590be7765e6
 USBUTILS		:= usbutils-$(USBUTILS_VERSION)
 USBUTILS_SUFFIX		:= tar.xz
 USBUTILS_URL		:= $(call ptx/mirror, KERNEL, utils/usb/usbutils/$(USBUTILS).$(USBUTILS_SUFFIX))
@@ -36,9 +36,7 @@ USBUTILS_ENV 	:= $(CROSS_ENV)
 #
 USBUTILS_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--disable-zlib \
-	--enable-usbids
+	$(GLOBAL_LARGE_FILE_OPTION)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -62,7 +60,6 @@ endif
 ifdef PTXCONF_USBUTILS_USBDEVICES
 	@$(call install_copy, usbutils, 0, 0, 0755, -, /usr/bin/usb-devices)
 endif
-	@$(call install_copy, usbutils, 0, 0, 0644, -, /usr/share/usb.ids,n)
 
 	@$(call install_finish, usbutils)
 
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de