From: Simon Hailes Date: Tue, 11 Oct 2016 18:01:21 +0000 (+0100) Subject: usbmode: rename data files X-Git-Tag: v17.01.0-rc1~1044 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a2361eebfd5c000315cfb612b8ffb08c7c00ed17;p=openwrt%2Fstaging%2Fxback.git usbmode: rename data files This is to ensure that git can be cloned onto a windows drive without failing. Signed-off-by: Simon Hailes --- diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile index 6737b5f42b..d835d373ba 100644 --- a/package/utils/usbmode/Makefile +++ b/package/utils/usbmode/Makefile @@ -45,6 +45,17 @@ define Build/Prepare 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 diff --git a/package/utils/usbmode/data/12d1-1f16 b/package/utils/usbmode/data/12d1-1f16 new file mode 100644 index 0000000000..beda01fba9 --- /dev/null +++ b/package/utils/usbmode/data/12d1-1f16 @@ -0,0 +1,2 @@ +# Vodafone K5150 +MBIM=1 diff --git a/package/utils/usbmode/data/12d1:1f16 b/package/utils/usbmode/data/12d1:1f16 deleted file mode 100644 index beda01fba9..0000000000 --- a/package/utils/usbmode/data/12d1:1f16 +++ /dev/null @@ -1,2 +0,0 @@ -# Vodafone K5150 -MBIM=1