From 063baa5edd9c5f99c279249065795c7e87dad83c Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Mon, 23 Oct 2017 12:27:02 +0200
Subject: [PATCH] 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 | 2 +-
.../files/etc/uci-defaults/50-fff-boardname | 13 ++++++++++---
.../{network.tl-wr841n-v10 => network.tl-wr841-v10} | 0
.../{network.tl-wr841n-v11 => network.tl-wr841-v11} | 0
.../fff/fff-network/ar71xx/network.tl-wr841-v12 | 10 ++++++++++
.../{network.tl-wr841nd-v7 => network.tl-wr841-v7} | 0
.../{network.tl-wr841n-v8 => network.tl-wr841-v8} | 0
.../{network.tl-wr841n-v9 => network.tl-wr841-v9} | 0
src/packages/fff/fff-sysupgrade/Makefile | 2 +-
.../fff/fff-sysupgrade/files/etc/sysupgrade.sh | 10 ----------
10 files changed, 22 insertions(+), 15 deletions(-)
mode change 100755 => 100644 src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
rename src/packages/fff/fff-network/ar71xx/{network.tl-wr841n-v10 => network.tl-wr841-v10} (100%)
rename src/packages/fff/fff-network/ar71xx/{network.tl-wr841n-v11 => network.tl-wr841-v11} (100%)
create mode 100644 src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12
rename src/packages/fff/fff-network/ar71xx/{network.tl-wr841nd-v7 => network.tl-wr841-v7} (100%)
rename src/packages/fff/fff-network/ar71xx/{network.tl-wr841n-v8 => network.tl-wr841-v8} (100%)
rename src/packages/fff/fff-network/ar71xx/{network.tl-wr841n-v9 => network.tl-wr841-v9} (100%)
diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile
index 31e67316..499ae913 100644
--- a/src/packages/fff/fff-boardname/Makefile
+++ b/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)
diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
old mode 100755
new mode 100644
index 94b98843..54704058
--- a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname
+++ b/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
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v10
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v10
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v10
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v11
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v11
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v11
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v12
new file mode 100644
index 00000000..4d22fded
--- /dev/null
+++ b/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
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v7
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841nd-v7
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v7
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v8
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v8
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v8
diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9 b/src/packages/fff/fff-network/ar71xx/network.tl-wr841-v9
similarity index 100%
rename from src/packages/fff/fff-network/ar71xx/network.tl-wr841n-v9
rename to src/packages/fff/fff-network/ar71xx/network.tl-wr841-v9
diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile
index ab809c9e..246db80f 100644
--- a/src/packages/fff/fff-sysupgrade/Makefile
+++ b/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)
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
index 8aaa924e..8ef4949b 100755
--- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh
+++ b/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"
--
GitLab