usbutils: avoid duplicating the git revision

[openwrt/staging/lynxis.git] / package / utils / usbutils / Makefile

diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
index dc57155149ffdf7d3131dae311efd85ed66ae06b..2411452a0d266b34838b1f2e04f67bee04eed7f0 100644 (file)
--- a/package/utils/usbutils/Makefile
+++ b/package/utils/usbutils/Makefile
@@ -9,20 +9,18 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbutils
 PKG_VERSION:=007
-PKG_RELEASE:=3
+PKG_RELEASE:=6
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
-PKG_MD5SUM:=a6bd63d5c44cebb717a960eae22a3ca9
-
-USB_IDS_VERSION:=2016-03-03
-USB_IDS_MD5SUM:=273596b6ee101b1df454827cfa87dff8
-USB_IDS_FILE:=usb.ids
+PKG_HASH:=7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-PKG_MAINTAINER := Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER := Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,16 +32,19 @@ define Package/usbutils
   URL:=http://www.linux-usb.org/
 endef
 
+USB_IDS_REV:=ae25707c751fff79148328229a76fc44232abeae
+USB_IDS_FILE:=usb.ids.$(USB_IDS_REV)
 define Download/usb_ids
   FILE:=$(USB_IDS_FILE)
-  URL:=https://raw.githubusercontent.com/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822
-  MD5SUM:=$(USB_IDS_MD5SUM)
+  URL_FILE:=usb.ids
+  URL:=@GITHUB/gentoo/hwids/$(USB_IDS_REV)
+  HASH:=eca5d4b4b2c72e61d5d6d67b5dc6f75e92b4ac9cf9cdf1344f06622e0f57d82f
 endef
 $(eval $(call Download,usb_ids))
 
 define Build/Prepare
        $(Build/Prepare/Default)
-       $(CP) $(DL_DIR)/$(USB_IDS_FILE) $(PKG_BUILD_DIR)
+       $(CP) $(DL_DIR)/$(USB_IDS_FILE) $(PKG_BUILD_DIR)/usb.ids
 endef
 
 CONFIGURE_ARGS += \