usbutils: avoid duplicating the git revision

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

diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
index 482d4c4352cb8dc62ec57213b9040a404de705f3..2411452a0d266b34838b1f2e04f67bee04eed7f0 100644 (file)
--- a/package/utils/usbutils/Makefile
+++ b/package/utils/usbutils/Makefile
@@ -9,18 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbutils
 PKG_VERSION:=007
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
-PKG_MD5SUM:=7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4
+PKG_HASH:=7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING
 
-USB_IDS_VERSION:=2016-07-21
-USB_IDS_MD5SUM:=49214de0abe87ed2f1d854a38387d97ddda61bb0a4bd41b91b3deb72242dfa68
-USB_IDS_FILE:=usb.ids
-
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
@@ -36,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:=@GITHUB/gentoo/hwids/83b7c8958d17329ee6c0224b38e41c0bc4c66bcd
-  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 += \