usbutils: update to 013

Version 008 started requiring libudev. Now that we have libudev-zero,
switch to that.

Remove custom usb.ids handling as that was split to a separate package.

Add datadir override as otherwise it would expect usb.ids in the wrong
place.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/utils/usbutils/Makefile b/utils/usbutils/Makefile
index 4e32e27a061793015080a260859e572406a3a9bc..8e2c9280a45134c6beee1f81d1206164508f4d31 100644 (file)
--- a/utils/usbutils/Makefile
+++ b/utils/usbutils/Makefile
@@ -8,53 +8,37 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbutils
-PKG_VERSION:=007
-PKG_RELEASE:=11
+PKG_VERSION:=013
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
-PKG_HASH:=7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4
-PKG_LICENSE:=GPL-2.0
+PKG_HASH:=9e23494fcc78b7a80ee29a07dd179c95ae2f71509c35728dbbabc2d1cca41338
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=COPYING
 
-PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/usbutils
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libusb-1.0 +librt +libpthread
+  DEPENDS:=+libusb-1.0 +libudev +usbids +librt +libpthread
   TITLE:=USB devices listing utilities
   URL:=http://www.linux-usb.org/
 endef
 
-USB_IDS_VER:=0.339
-USB_IDS_FILE:=usb.ids.$(USB_IDS_VER)
-define Download/usb_ids
-  FILE:=$(USB_IDS_FILE)
-  URL_FILE:=usb.ids
-  URL:=@GITHUB/vcrhonek/hwdata/v$(USB_IDS_VER)
-  HASH:=5ab6b663d3119217aa4117e95063c9b82646107344f2ae1d22248c6c29389fd7
-endef
-$(eval $(call Download,usb_ids))
-
-define Build/Prepare
-       $(Build/Prepare/Default)
-       $(CP) $(DL_DIR)/$(USB_IDS_FILE) $(PKG_BUILD_DIR)/usb.ids
-endef
-
 CONFIGURE_ARGS += \
-       --disable-zlib
+       --datadir=$(CONFIGURE_PREFIX)/share/hwdata
 
 define Package/usbutils/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lsusb $(1)/usr/bin/
-       $(INSTALL_DIR) $(1)/usr/share
-       $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(1)/usr/share/
 endef
 
 $(eval $(call BuildPackage,usbutils))