Author: nbd
Date: 2015-12-13 19:05:42 +0100 (Sun, 13 Dec 2015)
New Revision: 47889

Modified:
   trunk/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
Log:
ar71xx: Update merakinand.sh to fix sysupgrade

Remove reliance on /lib/upgrade/nand.sh as this is called by sysupgrade,
based on felix's comments at
https://lists.openwrt.org/pipermail/openwrt-devel/2015-December/037963.html

Signed-off-by: Chris R Blake <[email protected]>

Modified: trunk/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
===================================================================
--- trunk/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh      
2015-12-13 17:04:12 UTC (rev 47888)
+++ trunk/target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh      
2015-12-13 18:05:42 UTC (rev 47889)
@@ -7,7 +7,6 @@
 #
 . /lib/ar71xx.sh
 . /lib/functions.sh
-. /lib/upgrade/nand.sh
 
 get_magic_at() {
        local mtddev=$1
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to