[OpenWrt-Devel] [RFC] Fixing broke sysupgrade caused by r47878 (add mr18)

[Felix Fietkau]

On 2015-12-12 23:48, Christian Lamparter wrote:
> The patch "ar71xx: add support for Cisco's MR18" unfortunately
> broke sysupgrade for non-nand ar71xx platforms. This is because
> the merakinand.sh was added to the base-files for the ar71xx
> platforms and it tries to load /lib/upgrade/nand.sh which is only
> present if procd-nand is selected (which happens only for
> ar71xx-nand devices)
>  
> For people affected by this:
> just remove the /lib/upgrade/merakinand.sh file on the
> platform. (You can do that on the router - you don't need it.)
>  
> I see two possible solutions ATM:
> 
> 1. put . /lib/upgrade/nand.sh include into the merakinand_* functions
> 
> 2. move merakinand.sh to procd 
Here's option 3:

remove the explicit '. /lib/upgrade/nand.sh' call, the file should
already be included by sysupgrade itself, which does:
include /lib/upgrade

- Felix
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel