[PATCH] build: Remove "squashfs" from image names

Adrian Schmutzler freifunk at adrianschmutzler.de
So Feb 3 18:13:45 CET 2019


Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 buildscript                                             | 1 +
 src/packages/fff/fff-sysupgrade/Makefile                | 2 +-
 src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/buildscript b/buildscript
index 02cb6c4e..3ba36a6a 100755
--- a/buildscript
+++ b/buildscript
@@ -285,6 +285,7 @@ cp_firmware() {
         filename_build=${image//openwrt/fff-${version}}
         filename_build=${filename_build//generic/g}
         filename_build=${filename_build//tiny/t}
+        filename_build=${filename_build//squashfs-/}
         cp "$target/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build"
 
         for region in "" "-eu" "-us"; do
diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
index 1f7b65eb..90ef66af 100644
--- a/src/packages/fff/fff-sysupgrade/Makefile
+++ b/src/packages/fff/fff-sysupgrade/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-sysupgrade
-PKG_VERSION:=8
+PKG_VERSION:=9
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index 87ac48ab..c8d037ce 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -69,7 +69,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then
   done
 fi
 
-FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin"
+FILE="fff-${VERSION}-${SOC}-${BOARD}-sysupgrade.bin"
 echo "Downloading $FILE"
 echo ""
 wget "${UPGRADE_PATH}/${FILE}"
-- 
2.11.0



Mehr Informationen über die Mailingliste franken-dev