From dc18e22a292a8bddedfcb26c3a20be3995ea58ad Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim@tn-x.org>
Date: Wed, 17 Oct 2018 18:36:13 +0200
Subject: [PATCH] fff-sysupgrade: Update sysupgrade.sh to support openwrt-18.06
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Niemeyer <tim@tn-x.org>
Reviewed-by: Fabian Bläse <fabian@blaese.de>
[Set PKG_RELEASE back to 1]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-sysupgrade/Makefile           |  4 ++--
 .../fff/fff-sysupgrade/files/etc/sysupgrade.sh     | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
index 0be55ab..1ed3d46 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 6b6c10a..83aa418 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}"