- usbutils: bump version to 014; rework build

package/usbutils/patches/usbutils-avoid-dependency-on-bash.patch

@@ -1,30 +0,0 @@
-From 333d5fbbc03481f1aa222bd68c2609db168ae3e0 Mon Sep 17 00:00:00 2001
-From: Paul Eggleton <paul.eggleton@linux.intel.com>
-Date: Thu, 26 Jul 2012 10:37:32 +0100
-Subject: [PATCH] usb-devices: avoid dependency on bash
-
-By virtue of having #!/bin/bash this script declared that it requires
-bash, however manual examination, checkbashisms and tests with dash
-and busybox show that it doesn't contain any bashisms, so change the
-header to avoid the dependency.
-
-Upstream-Status: Pending
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
----
- usb-devices |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/usb-devices b/usb-devices
-index b2052e2..14a5358 100755
---- a/usb-devices
-+++ b/usb-devices
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- # Copyright: 2009 Greg Kroah-Hartman <greg@kroah.com>
- #            2009 Randy Dunlap <rdunlap@xenotime.net>
--- 
-1.7.9.5
-

package/usbutils/patches/usbutils-fix-null-pointer-crash.patch

@@ -1,28 +0,0 @@
-Fix NULL pointer crash.
-
-Before use usbbuslist, we should check if it is valid.
-
-Upstream-Status: Pending
-Signed-off-by: Roy.Li <rongqing.li@windriver.com>
----
- lsusb-t.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/lsusb-t.c b/lsusb-t.c
-index f604155..583a46a 100644
---- a/lsusb-t.c
-+++ b/lsusb-t.c
-@@ -643,6 +643,10 @@ static void sort_busses(void)
- 	/* need to reverse sort bus numbers */
- 	struct usbbusnode *t, *p, **pp;
- 	int swapped;
-+
-+	if (!usbbuslist)
-+		return;
-+
- 	do {
- 		p = usbbuslist;
- 		pp = &usbbuslist;
--- 
-1.7.4.1
-

package/usbutils/usbutils.mk

@@ -4,29 +4,17 @@
 #
 ################################################################################
 
-# usbutils-008 needs udev
+USBUTILS_VERSION = 014
-USBUTILS_VERSION = 007
 USBUTILS_DIR = usbutils-$(USBUTILS_VERSION)
 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz
 USBUTILS_SITE = $(KERNEL_MIRROR)/linux/utils/usb/usbutils
 
-$(DL_DIR)/$(USBUTILS_SOURCE):
+USBUTILS_DEPENDENCIES = libusb-compat libudev-zero
-	$(download) $(USBUTILS_SITE)/$(USBUTILS_SOURCE)
 
-USBUTILS_DEPENDENCIES = libusb-compat
+define USBUTILS_TARGET_CLEANUP
+	$(TARGET_RM) $(addprefix $(TARGET_bindir)/,lsusb.py usbhid-dump)
+endef
+USBUTILS_TARGET_FINALIZE_HOOKS += USBUTILS_TARGET_CLEANUP
 
-usbutils: $(USBUTILS_DEPENDENCIES) $(DL_DIR)/$(USBUTILS_SOURCE) | $(TARGET_DIR)
+usbutils: | $(TARGET_DIR)
-	$(REMOVE)/$(PKG_DIR)
+	$(call autotools-package)
-	$(UNTAR)/$(PKG_SOURCE)
-	$(call APPLY_PATCHES,$(PKG_PATCHES_DIR))
-	$(CHDIR)/$(PKG_DIR); \
-		$(CONFIGURE); \
-		$(MAKE); \
-		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(TARGET_RM) $(TARGET_bindir)/lsusb.py
-	$(TARGET_RM) $(TARGET_bindir)/usbhid-dump
-	$(TARGET_RM) $(TARGET_sbindir)/update-usbids.sh
-	$(TARGET_RM) $(TARGET_datadir)/pkgconfig
-	$(TARGET_RM) $(TARGET_datadir)/usb.ids.gz
-	$(REMOVE)/$(PKG_DIR)
-	$(TOUCH)