From patchwork Tue Aug  7 05:09:08 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Alternative,
 5/7] fff-sysupgrade: Update sysupgrade.sh to support openwrt-18.06
From: Tim Niemeyer <tim@tn-x.org>
X-Patchwork-Id: 918
Message-Id: <20180807050910.7608-6-tim@tn-x.org>
To: franken-dev@freifunk.net
Date: Tue,  7 Aug 2018 07:09:08 +0200

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

 src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index 6b6c10af..83aa418c 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -17,9 +17,13 @@ BOARD=$(uci get board.model.name)
 #decide SOC
 case $BOARD in
     tl-wdr4900-v1 )
-        SOC="mpc85xx" ;;
+        SOC="mpc85xx"
+        SUBTARGET="g"
+        ;;
     * )
-        SOC="ar71xx" ;;
+        SOC="ar71xx"
+        SUBTARGET="t"
+        ;;
 esac
 echo ""
 echo "Hardware: $BOARD"
@@ -27,9 +31,9 @@ echo "Hardware: $BOARD"
 #rewrite BOARD
 case $BOARD in
     cpe210 )
-        BOARD="cpe210-220" ;;
+        BOARD="cpe210-220-v1" ;;
     cpe510 )
-        BOARD="cpe510-520" ;;
+        BOARD="cpe510-520-v1" ;;
 esac
 
 wget "${UPGRADE_PATH}/release.nfo"
@@ -67,7 +71,7 @@ if [ "$VERSION" -eq "$FIRMWARE_VERSION" ]; then
   done
 fi
 
-FILE="fff-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin"
+FILE="fff-${VERSION}-${SOC}-${SUBTARGET}-${BOARD}-squashfs-sysupgrade.bin"
 echo "Downloading $FILE"
 echo ""
 wget "${UPGRADE_PATH}/${FILE}"