[OpenWrt-Devel] [PATCH v3] package/utils/usbutils: Update USB IDs list and drop gzip compression

[Hauke Mehrtens]

On 04/07/2016 08:50 AM, Daniel Engberg wrote:
> 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.
> 
> Tested on ar71xx
> 
> v2 Now contains the correct patch, sorry!
> v3 Turns out that the update-usbids.sh.in isn't executed at all...
> 
> Signed-off-by: Daniel Engberg <daniel.engberg.lists at pyret.net>
> 
> ---
> 
> diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
> index 9b5470a..c1b82a9 100644
> --- a/package/utils/usbutils/Makefile
> +++ b/package/utils/usbutils/Makefile
> @@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk
> 
>  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
> @@ -36,22 +36,24 @@ endef
> 
>  define Download/usb_ids
>    FILE:=$(USB_IDS_FILE)
> -  URL:=http://projects.pyret.net/dump/openwrt/distfiles
> +  URL:=https://raw.githubusercontent.com/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822

This is a much older version of the usb.id database. The header says it
is from 2013-08-21 20:34:03.

>    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

You can probably also remove the zlib dependency from the package
Depends now.

> +
>  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-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
> 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel