gemini: In-flight ethernet patches

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

diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile
index 89deda3e0a63545d5887dfd55e74ba81caff9d10..33362d33c87edc1de7b60626a5dea3dd4701b9aa 100644 (file)
--- a/package/utils/usbmode/Makefile
+++ b/package/utils/usbmode/Makefile
@@ -1,22 +1,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbmode
-PKG_VERSION:=2014-07-18
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://git.openwrt.org/project/usbmode.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=01ecc3b9764d1dd89cf36ede0a2d98f9adb0cd33
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL=$(PROJECT_GIT)/project/usbmode.git
+PKG_SOURCE_DATE:=2022-02-24
+PKG_SOURCE_VERSION:=3c8595a4e75510f58fa231b145d5506768dcafc9
+PKG_MIRROR_HASH:=e8a40ed3b849c3b9ba9c9823a4631731dcf261d3529f173ff5973f7cc08add15
 CMAKE_INSTALL:=1
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=
 
-PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
-PKG_DATA_VERSION:=20140529
+PKG_DATA_VERSION:=20191128
 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:=dff94177781298aaf0b3c2a3c3dea6b2
+  HASH:=3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9
 endef
 $(eval $(call Download,data))
 
@@ -41,8 +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
@@ -50,7 +66,7 @@ define Package/usb-modeswitch/install
        perl $(PKG_BUILD_DIR)/convert-modeswitch.pl \
                $(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/* \
                > $(1)/etc/usb-mode.json
-       $(INSTALL_DATA) ./files/usbmode.hotplug $(1)/etc/hotplug.d/usb/20-usb_mode
+       $(INSTALL_CONF) ./files/usbmode.hotplug $(1)/etc/hotplug.d/usb/20-usb_mode
        $(INSTALL_BIN) ./files/usbmode.init $(1)/etc/init.d/usbmode
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbmode $(1)/sbin/
 endef