[PATCH 2/4] Remove target and subtarget from filename
Fabian Bläse
fabian at blaese.de
Di Nov 19 21:19:38 CET 2019
This simplifies and shortens filenames quite significantly.
A rewrite script will be installed on the update servers
to allow updating routers with older firmwares.
Signed-off-by: Fabian Bläse <fabian at blaese.de>
---
buildscript | 3 +--
.../fff/fff-sysupgrade/files/etc/sysupgrade.sh | 12 +-----------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/buildscript b/buildscript
index 0920b74..4c54aec 100755
--- a/buildscript
+++ b/buildscript
@@ -296,9 +296,8 @@ cp_firmware() {
for image in ${images[@]}; do
filename_build=${image//openwrt/fff-${version}}
- filename_build=${filename_build//generic/g}
- filename_build=${filename_build//tiny/t}
filename_build=${filename_build//squashfs-/}
+ filename_build=${filename_build//${chipset}-${subtarget}-/}
cp "$builddir/bin/targets/${chipset}/${subtarget}/$image" "./bin/$filename_build"
for region in "" "-eu" "-us"; do
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index b42b19a..2b749f3 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -14,16 +14,6 @@ fi
BOARD=$(uci get board.model.name)
-#decide SOC
-case $BOARD in
- tl-wdr4900-v1 )
- SOC="mpc85xx-g"
- ;;
- * )
- SOC="ar71xx-t"
- ;;
-esac
-echo ""
echo "Hardware: $BOARD"
#rewrite BOARD
@@ -69,7 +59,7 @@ if [ "$VERSION" = "$FIRMWARE_VERSION" ]; then
done
fi
-FILE="fff-${VERSION}-${SOC}-${BOARD}-sysupgrade.bin"
+FILE="fff-${VERSION}-${BOARD}-sysupgrade.bin"
echo "Downloading $FILE"
echo ""
/bin/busybox wget "${UPGRADE_PATH}/${FILE}"
--
2.24.0
Mehr Informationen über die Mailingliste franken-dev