base-files: drop fwtool_pre_upgrade

[openwrt/staging/wigyori.git] / package / utils / usbmode / Makefile

diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile
index 4b481126b3b1c95a67a0526526f6171dd0754230..e229c791c074633e16c3b61f07b1a090699800d0 100644 (file)
--- a/package/utils/usbmode/Makefile
+++ b/package/utils/usbmode/Makefile
@@ -1,14 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbmode
-PKG_VERSION:=2014-08-26
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=$(LEDE_GIT)/project/usbmode.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=993a9a542791953c4804f7ddbb3a07756738e37a
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/usbmode.git
+PKG_SOURCE_DATE:=2017-12-19
+PKG_SOURCE_VERSION:=f40f84c27534159066c94dadc0c08e0b255c3e26
+PKG_MIRROR_HASH:=840c7ee2843102b09d8943a20820025251cc259385e2b0bde6b7c8cce8190f83
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
@@ -16,7 +15,7 @@ PKG_LICENSE_FILES:=
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
-PKG_DATA_VERSION:=20150115
+PKG_DATA_VERSION:=20170205
 PKG_DATA_URL:=http://www.draisberghof.de/usb_modeswitch
 PKG_DATA_PATH:=usb-modeswitch-data-$(PKG_DATA_VERSION)
 PKG_DATA_FILENAME:=$(PKG_DATA_PATH).tar.bz2
@@ -27,7 +26,7 @@ include $(INCLUDE_DIR)/cmake.mk
 define Download/data
   FILE:=$(PKG_DATA_FILENAME)
   URL:=$(PKG_DATA_URL)
-  MD5SUM:=662bcd56a97e560ea974bc710822de51
+  HASH:=e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1
 endef
 $(eval $(call Download,data))
 
@@ -41,9 +40,25 @@ endef
 define Build/Prepare
        $(Build/Prepare/Default)
        tar xvfj $(DL_DIR)/$(PKG_DATA_FILENAME) -C $(PKG_BUILD_DIR)
-       rm -f \
-               $(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/05c6:1000:sVe=GT
+       #remove devices with unsupported modes
+       for filevar in $(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/* ; \
+       do \
+               if grep -q -E '(Quanta|Option|Blackberry|Pantech)Mode' "$$$$filevar" ; then \
+                       rm "$$$$filevar" ; \
+               fi \
+       done
        cp ./data/* $(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/
+       #in order to keep the Lede GIT repo free of filenames with colons,
+       #we name the files xxxx-yyyy
+       # and rename here after copying to the build directory
+       for filevar in $(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/*-* ; \
+       do \
+               [ -f "$$$$filevar" ] || continue ; \
+               FILENAME=$$$$(basename $$$$filevar) ; \
+               NEWNAME=$$$${FILENAME//-/:} ; \
+               rm "$(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/$$$$NEWNAME" ; \
+               mv "$(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/$$$$FILENAME" "$(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/$$$$NEWNAME" ; \
+       done
 endef
 
 define Package/usb-modeswitch/install