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 
This mostly reverts the original commit e9929ebeea ("ramips: Fix
sysupgrade for Xiaomi mir3g") and replaces it with setting the
BOARD_NAME to the old value.

This way the folder in the tar will be named sysupgrade-mir3g and not
sysupgrade-xiaomi_mir3g and the sysupgrade in OpenWrt 18.06 can find it.

Without this change sysupgrade from 18.06 to 19.07 is only possible with
the -F option.

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-06 16:33:27 +01:00
parent f58705b77e
commit a3ffeb413b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,25 +269,26 @@ define Device/xiaomi_mir3p
endef endef
TARGET_DEVICES += xiaomi_mir3p TARGET_DEVICES += xiaomi_mir3p
define Device/mir3g define Device/xiaomi_mir3g
DTS := MIR3G DTS := MIR3G
BLOCKSIZE := 128k BLOCKSIZE := 128k
PAGESIZE := 2048 PAGESIZE := 2048
KERNEL_SIZE := 4096k KERNEL_SIZE := 4096k
IMAGE_SIZE := 32768k IMAGE_SIZE := 32768k
UBINIZE_OPTS := -E 5 UBINIZE_OPTS := -E 5
BOARD_NAME := mir3g
IMAGES += kernel1.bin rootfs0.bin IMAGES += kernel1.bin rootfs0.bin
IMAGE/kernel1.bin := append-kernel IMAGE/kernel1.bin := append-kernel
IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE) IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
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 += xiaomi,mir3g SUPPORTED_DEVICES += 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 += mir3g TARGET_DEVICES += xiaomi_mir3g
define Device/mt7621 define Device/mt7621
DTS := MT7621 DTS := MT7621