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

treewide: sysupgrade: don't use $ARGV in platform_do_upgrade()

Browse Source 
stage2 passes image path to platform_do_upgrade() as an argument so it
can be simply accessed using $1

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 8b4bc7abe0)
[rmilecki: dropping ARGV without this change broke sysupgrade]
Fixes: 6ac62c4b6c ("base-files: don't set ARGV and ARGC")
This commit is contained in:
Rafał Miłecki
2019-07-14 19:03:19 +02:00
parent 986c706cd1
commit 5ae87c76b7
15 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/layerscape/base-files/lib/upgrade/platform.sh
View File

@@ -17,7 +17,7 @@ platform_do_upgrade_traverse_nandubi() {
CI_UBIPART="nandubi"
CI_KERNPART="kernel${newbootsys}"
CI_ROOTPART="rootfs${newbootsys}"
nand_do_upgrade "$ARGV" || (echo "Upgrade failed, setting bootsys ${bootsys}" && fw_setenv bootsys $bootsys)
nand_do_upgrade "$1" || (echo "Upgrade failed, setting bootsys ${bootsys}" && fw_setenv bootsys $bootsys)
}
platform_check_image() {
@@ -42,7 +42,7 @@ platform_do_upgrade() {
case "$board" in
traverse,ls1043v | \
traverse,ls1043s)
platform_do_upgrade_traverse_nandubi "$ARGV"
platform_do_upgrade_traverse_nandubi "$1"
;;
*)
echo "Sysupgrade is not currently supported on $board"