From 25c153c5808436b82e126064bd1c9040cf5822fc Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 26 Apr 2016 11:43:49 +0000 Subject: [PATCH] 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 SVN-Revision: 49246 --- package/utils/usbutils/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile index 9b5470a5db..dc57155149 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 @@ -29,29 +29,31 @@ 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://projects.pyret.net/dump/openwrt/distfiles + URL:=https://raw.githubusercontent.com/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822 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)) -- 2.30.2