domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ramips: Fix sysupgrade for Xiaomi mir3g

Browse Source 
Without this change sysupgrade from 18.06 to 19.07 is only possible with
the -F option.
In OpenWrt 18.06 the nand_do_platform_check() function is called with
the board name mir3g only, if the tar does not use mir3g it will fail.
OpenWrt 19.07 and later support the metadata with the supported_devices
attribute to allow renaming. Do the renaming of the target between 19.07
and master like it is done for some other boards.

I tested the following sysupgrades successfully without -F
18.06 -> 19.07
19.07 -> master
master -> 19.07

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2020-01-05 15:10:06 +01:00
parent dc399c4e12
commit e9929ebeea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/ramips/image/mt7621.mk
View File

@@ -269,7 +269,7 @@ define Device/xiaomi_mir3p
endef endef
TARGET_DEVICES += xiaomi_mir3p TARGET_DEVICES += xiaomi_mir3p
define Device/xiaomi_mir3g define Device/mir3g
DTS := MIR3G DTS := MIR3G
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
@@ -282,12 +282,12 @@ define Device/xiaomi_mir3g
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
DEVICE_TITLE := Xiaomi Mi Router 3G DEVICE_TITLE := Xiaomi Mi Router 3G
SUPPORTED_DEVICES += R3G SUPPORTED_DEVICES += R3G
SUPPORTED_DEVICES += mir3g SUPPORTED_DEVICES += xiaomi,mir3g
DEVICE_PACKAGES := \ DEVICE_PACKAGES := \
kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \ kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic \
uboot-envtools uboot-envtools
endef endef
TARGET_DEVICES += xiaomi_mir3g TARGET_DEVICES += mir3g
define Device/mt7621 define Device/mt7621
DTS := MT7621 DTS := MT7621