X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Futils%2Fusbutils%2FMakefile;h=482d4c4352cb8dc62ec57213b9040a404de705f3;hp=bab383f4946435c7cd452a3e17c223c55c63452a;hb=eb16168dc71565601c447db36777d2d8fc344e12;hpb=c10d97484a43375a0446dafc8cb4072e26502f37;ds=sidebyside

diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
index bab383f494..482d4c4352 100644
--- a/package/utils/usbutils/Makefile
+++ b/package/utils/usbutils/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2013 OpenWrt.org
+# Copyright (C) 2007-2016 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,52 +9,53 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbutils
 PKG_VERSION:=007
-PKG_RELEASE:=1
+PKG_RELEASE:=5
 
-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
+PKG_MD5SUM:=7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
 
-USB_IDS_VERSION:=2013-01-16
-USB_IDS_MD5SUM:=2a2344907b6344f0935c86efaf9de620
-USB_IDS_FILE:=usb.ids.$(USB_IDS_VERSION).gz
+USB_IDS_VERSION:=2016-07-21
+USB_IDS_MD5SUM:=49214de0abe87ed2f1d854a38387d97ddda61bb0a4bd41b91b3deb72242dfa68
+USB_IDS_FILE:=usb.ids
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
-PKG_LICENSE:=GPL-2.0+
-PKG_LICENSE_FILES:=COPYING
-
-PKG_MAINTAINER := Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER := Felix Fietkau <nbd@nbd.name>
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/usbutils
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libusb-1.0 +zlib +librt +libpthread
+  DEPENDS:=+libusb-1.0 +librt +libpthread
   TITLE:=USB devices listing utilities
   URL:=http://www.linux-usb.org/
 endef
 
 define Download/usb_ids
   FILE:=$(USB_IDS_FILE)
-  URL:=http://mirror2.openwrt.org/sources
+  URL:=@GITHUB/gentoo/hwids/83b7c8958d17329ee6c0224b38e41c0bc4c66bcd
   MD5SUM:=$(USB_IDS_MD5SUM)
 endef
 $(eval $(call Download,usb_ids))
 
 define Build/Prepare
 	$(Build/Prepare/Default)
-	echo '#!/bin/sh' > $(PKG_BUILD_DIR)/update-usbids.sh.in
-	echo 'cp $(DL_DIR)/$(USB_IDS_FILE) usb.ids.gz' >> $(PKG_BUILD_DIR)/update-usbids.sh.in
+	$(CP) $(DL_DIR)/$(USB_IDS_FILE) $(PKG_BUILD_DIR)
 endef
 
+CONFIGURE_ARGS += \
+	--disable-zlib
+
 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.gz $(1)/usr/share/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(1)/usr/share/
 endef
 
 $(eval $(call BuildPackage,usbutils))