From: Mathias Kresin Date: Fri, 28 Jul 2017 17:22:55 +0000 (+0200) Subject: ramips: fix Mercury MAC1200R v2.0 board name X-Git-Tag: v18.06.0-rc1~2443 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=99f1097c0adcbe4730f86fbcdfbe7f291cdb25cf;p=oweals%2Fopenwrt.git 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 --- diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index 0267c9df3f..3efdeda533 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -290,7 +290,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 fbfc37d986..693e64f4dd 100644 --- a/target/linux/ramips/image/mt7628.mk +++ b/target/linux/ramips/image/mt7628.mk @@ -92,6 +92,7 @@ TARGET_DEVICES += duzun-dm06 define Device/mac1200r-v2 DTS := MAC1200RV2 DEVICE_TITLE := Mercury MAC1200R v2.0 + SUPPORTED_DEVICES := mac1200rv2 endef TARGET_DEVICES += mac1200r-v2