[source] ramips: fix Mercury MAC1200R v2.0 board name

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 29 00:26:01 PDT 2017


mkresin pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/5e409f0e69ce77186f4e70dd9068e43dfc36a9bc

commit 5e409f0e69ce77186f4e70dd9068e43dfc36a9bc
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Fri Jul 28 19:22:55 2017 +0200

    ramips: fix Mercury MAC1200R v2.0 board name
    
    With d2b6bf141662 ("ramips: fix image validation errors") the board
    name was changed to fix an image validation error. But this change
    wasn't applied to all other files using the board name, which broke
    sysupgrade.
    
    Revert this change and use the former board name in the metadata
    instead.
    
    Signed-off-by: Mathias Kresin <dev at kresin.me>
---
 target/linux/ramips/base-files/lib/ramips.sh | 2 +-
 target/linux/ramips/image/mt7628.mk          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh
index e642d56..17ada64 100755
--- a/target/linux/ramips/base-files/lib/ramips.sh
+++ b/target/linux/ramips/base-files/lib/ramips.sh
@@ -272,7 +272,7 @@ ramips_board_detect() {
 		name="m2m"
 		;;
 	*"Mercury MAC1200R v2")
-		name="mac1200r-v2"
+		name="mac1200rv2"
 		;;
 	*"MicroWRT")
 		name="microwrt"
diff --git a/target/linux/ramips/image/mt7628.mk b/target/linux/ramips/image/mt7628.mk
index 4502588..12c3c80 100644
--- a/target/linux/ramips/image/mt7628.mk
+++ b/target/linux/ramips/image/mt7628.mk
@@ -53,5 +53,6 @@ TARGET_DEVICES += duzun-dm06
 define Device/mac1200r-v2
   DTS := MAC1200RV2
   DEVICE_TITLE := Mercury MAC1200R v2.0
+  SUPPORTED_DEVICES := mac1200rv2
 endef
 TARGET_DEVICES += mac1200r-v2



More information about the lede-commits mailing list