fff-boardname: Reorganize WR841 boardnames

This patch achieves multiple goals:
- Align WR841 boardnames with image names
- Fix wrong name replace in sysupgrade
- Support sysupgrade of WR841 v12

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Tim Niemeyer <tim@tn-x.org>
- Rebased
Signed-off-by: Tim Niemeyer <tim@tn-x.org>

src/packages/fff/fff-boardname/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-boardname
-PKG_VERSION:=0.0.2
+PKG_VERSION:=3
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname

@@ -16,11 +16,18 @@ case "$BOARD" in
         grep 740 /var/sysinfo/model && BOARD=tl-wr740n-v4
         ;;
     tl-wr841n-v7)
-        BOARD=tl-wr841nd-v7
+        BOARD=tl-wr841-v7
+        ;;
+    tl-wr841n-v8)
+        BOARD=tl-wr841-v8
         ;;
     tl-wr841n-v9)
-        grep "v10" /var/sysinfo/model && BOARD=tl-wr841n-v10
-        grep "v11" /var/sysinfo/model && BOARD=tl-wr841n-v11
+        BOARD=tl-wr841-v9
+        grep "v10" /var/sysinfo/model && BOARD=tl-wr841-v10
+        ;;
+    tl-wr841n-v11)
+        BOARD=tl-wr841-v11
+        grep "v12" /var/sysinfo/model && BOARD=tl-wr841-v12
         ;;
     nanostation-m)
         BOARD=ubnt-nano-m

src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12

@@ -0,0 +1,10 @@
+PORTORDER="4 3 2 1"
+
+WANDEV=eth1
+SWITCHDEV=eth0
+CLIENT_PORTS="1 2 0t"
+WAN_PORTS=
+BATMAN_PORTS="3 4 0t"
+
+ETHMESHMAC=eth1
+ROUTERMAC=eth0

src/packages/fff/fff-sysupgrade/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-sysupgrade
-PKG_VERSION:=5
+PKG_VERSION:=6
 PKG_RELEASE:=4
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh

@@ -30,16 +30,6 @@ case $BOARD in
         BOARD="cpe210-220" ;;
     cpe510 )
         BOARD="cpe510-520" ;;
-    wr841nd-v7 )
-        BOARD="wr841-v7" ;;
-    wr841n-v8 )
-        BOARD="wr841-v8" ;;
-    wr841n-v9 )
-        BOARD="wr841-v9" ;;
-    wr841n-v10 )
-        BOARD="wr841-v10" ;;
-    wr841n-v11 )
-        BOARD="wr841-v11" ;;
 esac
 
 wget "${UPGRADE_PATH}/release.nfo"