From patchwork Sat Aug  4 14:34:25 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v3,
 6/8] fff-sysupgrade: Update sysupgrade.sh to support openwrt-18.06
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 907
Message-Id: <20180804143427.18488-7-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Sat,  4 Aug 2018 16:34:25 +0200

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-sysupgrade/Makefile           |  4 ++--
 .../fff/fff-sysupgrade/files/etc/sysupgrade.sh     | 28 +++++++++++++++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
index 0be55abd..1ed3d46c 100644
--- a/src/packages/fff/fff-sysupgrade/Makefile
+++ b/src/packages/fff/fff-sysupgrade/Makefile
@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-sysupgrade
-PKG_VERSION:=7
-PKG_RELEASE:=4
+PKG_VERSION:=8
+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 8ef4949b..72a10053 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
@@ -17,9 +17,23 @@ BOARD=$(uci get board.model.name)
 #decide SOC
 case $BOARD in
     tl-wdr4900-v1 )
-        SOC="mpc85xx" ;;
+        SOC="mpc85xx-g" ;;
+    tl-mr3020-v1 |\
+    tl-wa850re-v1 |\
+    tl-wa860re-v1 |\
+    tl-wa901nd-v2 |\
+    tl-wr740n-v4 |\
+    tl-wr741nd-v2 |\
+    tl-wr741nd-v4 |\
+    tl-wr841-v7 |\
+    tl-wr841-v8 |\
+    tl-wr841-v9 |\
+    tl-wr841-v10 |\
+    tl-wr841-v11 |\
+    tl-wr841-v12 )
+        SOC="ar71xx-tiny" ;;
     * )
-        SOC="ar71xx" ;;
+        SOC="ar71xx-g" ;;
 esac
 echo ""
 echo "Hardware: $BOARD"
@@ -27,9 +41,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,11 +81,7 @@ if [ "$VERSION" -eq "$FIRMWARE_VERSION" ]; then
   done
 fi
 
-if [ "$FIRMWARE_COMMUNITY" = "franken" ]; then
-    FIRMWARE_COMMUNITY="fff"
-fi
-
-FILE="${FIRMWARE_COMMUNITY}-${VERSION}-${SOC}-g-${BOARD}-squashfs-sysupgrade.bin"
+FILE="fff-${VERSION}-${SOC}-${BOARD}-squashfs-sysupgrade.bin"
 echo "Downloading $FILE"
 echo ""
 wget "${UPGRADE_PATH}/${FILE}"