usbmode: rename data files

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

diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile
index f88b48c06097e3399d41b1889df6f6c4b39b5040..d835d373bac18d8993254b42399db2fb195a75c9 100644 (file)
--- a/package/utils/usbmode/Makefile
+++ b/package/utils/usbmode/Makefile
@@ -1,22 +1,23 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usbmode
-PKG_VERSION:=2013-08-20
+PKG_VERSION:=2014-08-26
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://git.openwrt.org/project/usbmode.git
+PKG_SOURCE_URL=$(LEDE_GIT)/project/usbmode.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=575c8e8dec6d1f544debe867ebc0bde051209c17
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_VERSION:=993a9a542791953c4804f7ddbb3a07756738e37a
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_MD5SUM:=4ba4ed629ef4530fd5a60b84cf5bf7a7194f60b69068882d47c1d3c55e06fc8c
 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:=20121109
+PKG_DATA_VERSION:=20150115
 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 +28,7 @@ include $(INCLUDE_DIR)/cmake.mk
 define Download/data
   FILE:=$(PKG_DATA_FILENAME)
   URL:=$(PKG_DATA_URL)
-  MD5SUM:=a7d23a03157871013a0d708ab2b1b6df
+  MD5SUM:=662bcd56a97e560ea974bc710822de51
 endef
 $(eval $(call Download,data))
 
@@ -43,14 +44,27 @@ define Build/Prepare
        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
+       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
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/usb $(1)/sbin
+       $(INSTALL_DIR) $(1)/etc/hotplug.d/usb $(1)/etc/init.d $(1)/sbin
        perl $(PKG_BUILD_DIR)/convert-modeswitch.pl \
                $(PKG_BUILD_DIR)/$(PKG_DATA_PATH)/usb_modeswitch.d/* \
                > $(1)/etc/usb-mode.json
-       $(CP) ./files/usbmode.hotplug $(1)/etc/hotplug.d/usb/20-usb_mode
+       $(INSTALL_DATA) ./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