Author: blogic
Date: 2016-04-26 13:43:49 +0200 (Tue, 26 Apr 2016)
New Revision: 49246

Modified:
   trunk/package/utils/usbutils/Makefile
Log:
usbutils: Update USB IDs list and drop gzip compression

Change mirror to Github (Gentoo repo) and drop the gzip compression.
Worst case there's about 4kbyte increase in size but most images ends up
beign somewhere between 4-100kbyte smaller due to the lzma compression.

Signed-off-by: Daniel Engberg <[email protected]>

Modified: trunk/package/utils/usbutils/Makefile
===================================================================
--- trunk/package/utils/usbutils/Makefile       2016-04-26 11:43:45 UTC (rev 
49245)
+++ trunk/package/utils/usbutils/Makefile       2016-04-26 11:43:49 UTC (rev 
49246)
@@ -9,15 +9,15 @@
 
 PKG_NAME:=usbutils
 PKG_VERSION:=007
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils
 PKG_MD5SUM:=a6bd63d5c44cebb717a960eae22a3ca9
 
-USB_IDS_VERSION:=2015-12-17
-USB_IDS_MD5SUM:=8c091fdcdbc4e8e60a518d0148b0dad3
-USB_IDS_FILE:=usb.ids.$(USB_IDS_VERSION).gz
+USB_IDS_VERSION:=2016-03-03
+USB_IDS_MD5SUM:=273596b6ee101b1df454827cfa87dff8
+USB_IDS_FILE:=usb.ids
 
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
@@ -29,7 +29,7 @@
 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
@@ -36,7 +36,7 @@
 
 define Download/usb_ids
   FILE:=$(USB_IDS_FILE)
-  URL:=http://projects.pyret.net/dump/openwrt/distfiles
+  
URL:=https://raw.githubusercontent.com/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822
   MD5SUM:=$(USB_IDS_MD5SUM)
 endef
 $(eval $(call Download,usb_ids))
@@ -43,15 +43,17 @@
 
 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))
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to