[OpenWrt-Devel] [PATCH] ramips: Fix sysupgrade for Xiaomi mir3g

[mail at adrianschmutzler.de]

Hi Hauke,

> -----Original Message-----
> From: Hauke Mehrtens [mailto:hauke at hauke-m.de]
> Sent: Sonntag, 5. Januar 2020 15:18
> To: openwrt-devel at lists.openwrt.org
> Cc: mail at adrianschmutzler.de; dev at kresin.me; Hauke Mehrtens
> <hauke at hauke-m.de>
> Subject: [PATCH] ramips: Fix sysupgrade for Xiaomi mir3g
> 
> 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 at hauke-m.de>
> ---
>  target/linux/ramips/image/mt7621.mk | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/target/linux/ramips/image/mt7621.mk
> b/target/linux/ramips/image/mt7621.mk
> index 7eb59188fb..39017a48e1 100644
> --- a/target/linux/ramips/image/mt7621.mk
> +++ b/target/linux/ramips/image/mt7621.mk
> @@ -269,7 +269,7 @@ define Device/xiaomi_mir3p  endef  TARGET_DEVICES
> += xiaomi_mir3p
> 
> -define Device/xiaomi_mir3g
> +define Device/mir3g
>    DTS := MIR3G
>    BLOCKSIZE := 128k
>    PAGESIZE := 2048
> @@ -282,12 +282,12 @@ define Device/xiaomi_mir3g
>    IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
>    DEVICE_TITLE := Xiaomi Mi Router 3G
>    SUPPORTED_DEVICES += R3G
> -  SUPPORTED_DEVICES += mir3g
> +  SUPPORTED_DEVICES += xiaomi,mir3g

I do not really understand this patch, as still the names will be the same, but just the order will change. If you really rely on the first name to be mir3g, you could achieve this much easier by just using:

SUPPORTED_DEVICES := mir3g R3G xiaomi,mir3g

With that, you would not have to change the device node name at all.

Best

Adrian

>    DEVICE_PACKAGES := \
>  	kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic \
>  	uboot-envtools
>  endef
> -TARGET_DEVICES += xiaomi_mir3g
> +TARGET_DEVICES += mir3g
> 
>  define Device/mt7621
>    DTS := MT7621
> --
> 2.20.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: openpgp-digital-signature.asc
Type: application/pgp-signature
Size: 834 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20200105/363a62a9/attachment.sig>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel