[PATCH] Fix tplink c2600 boardname for fff-upgrade

Fabian Bläse fabian at blaese.de
Di Mär 31 21:03:16 CEST 2020


Because the upgrade filename is built based on
fff-boardname's configuration, and there is no special
treatment for the tplink c2600, the resulting filename
contains 'tplink,c2600', which is not the correct filename.

This patch sets the boardname explicitly, so the correct filename
is constructed in fff-upgrade, which also requires renaming the
fff-network file for this device.

Signed-off-by: Fabian Bläse <fabian at blaese.de>
---
 src/packages/fff/fff-boardname/Makefile                        | 2 +-
 .../fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname  | 3 +++
 src/packages/fff/fff-network/Makefile                          | 2 +-
 .../ipq806x/{network.tplink,c2600 => network.tplink_c2600}     | 0
 4 files changed, 5 insertions(+), 2 deletions(-)
 rename src/packages/fff/fff-network/ipq806x/{network.tplink,c2600 => network.tplink_c2600} (100%)

diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile
index 9c2f76d..01fcc0a 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_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
index cec595c..109dbe9 100644
--- a/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
+++ b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname
@@ -73,6 +73,9 @@ case "$BOARD" in
     archer-c7)
         BOARD=archer-c7-v2
         ;;
+    tplink,c2600)
+        BOARD=tplink_c2600
+        ;;
 esac
 
 uci set board.model.name=$BOARD
diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile
index 8f8c7f2..0c7e2bd 100644
--- a/src/packages/fff/fff-network/Makefile
+++ b/src/packages/fff/fff-network/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fff-network
-PKG_RELEASE:=17
+PKG_RELEASE:=18
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
diff --git a/src/packages/fff/fff-network/ipq806x/network.tplink,c2600 b/src/packages/fff/fff-network/ipq806x/network.tplink_c2600
similarity index 100%
rename from src/packages/fff/fff-network/ipq806x/network.tplink,c2600
rename to src/packages/fff/fff-network/ipq806x/network.tplink_c2600
-- 
2.26.0



Mehr Informationen über die Mailingliste franken-dev