[OpenWrt-Devel] [PATCH] treewide: sysupgrade: don't use $ARGV in platform_do_upgrade()

Rafał Miłecki zajec5 at gmail.com
Sun Jul 14 13:03:19 EDT 2019 

From: Rafał Miłecki <rafal at milecki.pl>

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 at milecki.pl>
---
 .../base-files/lib/upgrade/platform.sh         |  4 ++--
 .../ar71xx/base-files/lib/upgrade/dir825.sh    |  4 ++--
 .../ar71xx/base-files/lib/upgrade/platform.sh  | 18 +++++++++---------
 .../ath79/base-files/lib/upgrade/platform.sh   |  6 +++---
 .../cns3xxx/base-files/lib/upgrade/platform.sh |  2 +-
 .../gemini/base-files/lib/upgrade/platform.sh  |  2 +-
 .../ipq40xx/base-files/lib/upgrade/platform.sh |  8 ++++----
 .../ipq806x/base-files/lib/upgrade/platform.sh | 12 ++++++------
 .../ixp4xx/base-files/lib/upgrade/platform.sh  |  4 ++--
 .../base-files/lib/upgrade/platform.sh         |  4 ++--
 .../lantiq/base-files/lib/upgrade/platform.sh  |  2 +-
 .../base-files/lib/upgrade/platform.sh         |  4 ++--
 .../base-files/lib/upgrade/platform.sh         |  2 +-
 .../mpc85xx/base-files/lib/upgrade/platform.sh |  4 ++--
 .../mvebu/base-files/lib/upgrade/platform.sh   |  6 +++---
 .../ramips/base-files/lib/upgrade/platform.sh  |  8 ++++----
 16 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
index 02c750130c..32e87513f3 100755
--- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
@@ -22,7 +22,7 @@ platform_do_upgrade() {
 
 	case "$board" in
 	wd,mybooklive)
-		mbl_do_upgrade "$ARGV"
+		mbl_do_upgrade "$1"
 		;;
 	meraki,mr24|\
 	meraki,mx60|\
@@ -32,7 +32,7 @@ platform_do_upgrade() {
 		nand_do_upgrade "$1"
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
index 7ad3dd8e1f..430df251a0 100644
--- a/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/dir825.sh
@@ -148,7 +148,7 @@ platform_do_upgrade_dir825b() {
 		else
 			PART_NAME="firmware"
 		fi
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	"43493030")
 		if [ -z "$fw_mtd" ]; then
@@ -159,7 +159,7 @@ platform_do_upgrade_dir825b() {
 				exit 1
 			}
 		fi
-		dir825b_do_upgrade_combined "firmware" "$ARGV"
+		dir825b_do_upgrade_combined "firmware" "$1"
 		;;
 	esac
 }
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index c0f383b4e3..5de7af667f 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -806,7 +806,7 @@ platform_do_upgrade() {
 
 	case "$board" in
 	all0258n)
-		platform_do_upgrade_allnet "0x9f050000" "$ARGV"
+		platform_do_upgrade_allnet "0x9f050000" "$1"
 		;;
 	all0305|\
 	eap7660d|\
@@ -818,19 +818,19 @@ platform_do_upgrade() {
 	pb44|\
 	routerstation|\
 	routerstation-pro)
-		platform_do_upgrade_combined "$ARGV"
+		platform_do_upgrade_combined "$1"
 		;;
 	all0315n)
-		platform_do_upgrade_allnet "0x9f080000" "$ARGV"
+		platform_do_upgrade_allnet "0x9f080000" "$1"
 		;;
 	cap4200ag|\
 	eap300v2|\
 	ens202ext)
-		platform_do_upgrade_allnet "0xbf0a0000" "$ARGV"
+		platform_do_upgrade_allnet "0xbf0a0000" "$1"
 		;;
 	dir-825-b1|\
 	tew-673gru)
-		platform_do_upgrade_dir825b "$ARGV"
+		platform_do_upgrade_dir825b "$1"
 		;;
 	a40|\
 	a60|\
@@ -852,7 +852,7 @@ platform_do_upgrade() {
 	om5p-ac|\
 	om5p-acv2|\
 	om5p-an)
-		platform_do_upgrade_openmesh "$ARGV"
+		platform_do_upgrade_openmesh "$1"
 		;;
 	c-60|\
 	hiveap-121|\
@@ -903,14 +903,14 @@ platform_do_upgrade() {
 	uap-pro|\
 	unifi-outdoor-plus)
 		MTD_CONFIG_ARGS="-s 0x180000"
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	wp543|\
 	wpe72)
-		platform_do_upgrade_compex "$ARGV"
+		platform_do_upgrade_compex "$1"
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/ath79/base-files/lib/upgrade/platform.sh b/target/linux/ath79/base-files/lib/upgrade/platform.sh
index c2fe08154d..8c5a8e52fe 100644
--- a/target/linux/ath79/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ath79/base-files/lib/upgrade/platform.sh
@@ -41,14 +41,14 @@ platform_do_upgrade() {
 
 	case "$board" in
 	jjplus,ja76pf2)
-		redboot_fis_do_upgrade "$ARGV" linux
+		redboot_fis_do_upgrade "$1" linux
 		;;
 	ubnt,routerstation|\
 	ubnt,routerstation-pro)
-		redboot_fis_do_upgrade "$ARGV" kernel
+		redboot_fis_do_upgrade "$1" kernel
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
index aa98b47244..58dd6d7590 100644
--- a/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/cns3xxx/base-files/lib/upgrade/platform.sh
@@ -15,5 +15,5 @@ platform_check_image() {
 }
 
 platform_do_upgrade() {
-	default_do_upgrade "$ARGV"
+	default_do_upgrade "$1"
 }
diff --git a/target/linux/gemini/base-files/lib/upgrade/platform.sh b/target/linux/gemini/base-files/lib/upgrade/platform.sh
index 4fd169d0de..bab2f9878e 100644
--- a/target/linux/gemini/base-files/lib/upgrade/platform.sh
+++ b/target/linux/gemini/base-files/lib/upgrade/platform.sh
@@ -19,7 +19,7 @@ platform_do_upgrade() {
 	case "$board" in
 	dlink,dir-685)
 		PART_NAME=firmware
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index e62d16c449..a5e39c280c 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -51,7 +51,7 @@ platform_do_upgrade() {
 	avm,fritzbox-7530 |\
 	avm,fritzrepeater-3000 |\
 	qxwlan,e2600ac-c2)
-		nand_do_upgrade "$ARGV"
+		nand_do_upgrade "$1"
 		;;
 	asus,map-ac2200)
 		CI_KERNPART="linux"
@@ -64,7 +64,7 @@ platform_do_upgrade() {
 		;;
 	linksys,ea6350v3 |\
 	linksys,ea8300)
-		platform_do_upgrade_linksys "$ARGV"
+		platform_do_upgrade_linksys "$1"
 		;;
 	meraki,mr33)
 		CI_KERNPART="part.safe"
@@ -73,13 +73,13 @@ platform_do_upgrade() {
 	openmesh,a42 |\
 	openmesh,a62)
 		PART_NAME="inactive"
-		platform_do_upgrade_openmesh "$ARGV"
+		platform_do_upgrade_openmesh "$1"
 		;;
 	zyxel,nbg6617)
 		zyxel_do_upgrade "$1"
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
index 2f0190629e..5919613cb9 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -13,7 +13,7 @@ platform_do_upgrade() {
 	buffalo,wxr-2533dhp)
 		buffalo_upgrade_prepare_ubi
 		CI_ROOTPART="ubi_rootfs"
-		nand_do_upgrade "$ARGV"
+		nand_do_upgrade "$1"
 		;;
 	compex,wpq864|\
 	netgear,d7800 |\
@@ -23,24 +23,24 @@ platform_do_upgrade() {
 	qcom,ipq8064-ap148 |\
 	qcom,ipq8064-ap161 |\
 	zyxel,nbg6817)
-		nand_do_upgrade "$ARGV"
+		nand_do_upgrade "$1"
 		;;
 	linksys,ea8500)
-		platform_do_upgrade_linksys "$ARGV"
+		platform_do_upgrade_linksys "$1"
 		;;
 	tplink,c2600)
 		PART_NAME="os-image:rootfs"
 		MTD_CONFIG_ARGS="-s 0x200000"
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	tplink,vr2600v)
 		PART_NAME="kernel:rootfs"
 		MTD_CONFIG_ARGS="-s 0x200000"
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	nec,wg2600hp |\
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
index 92eeaffef6..3ba591fb3c 100644
--- a/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ixp4xx/base-files/lib/upgrade/platform.sh
@@ -128,10 +128,10 @@ platform_do_upgrade() {
 	v "board=$board"
 	case "$board" in
 	avila | cambria )
-		platform_do_upgrade_combined "$ARGV"
+		platform_do_upgrade_combined "$1"
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
index a25d90a096..6d63a0a4b7 100644
--- a/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
+++ b/target/linux/kirkwood/base-files/lib/upgrade/platform.sh
@@ -13,10 +13,10 @@ platform_do_upgrade() {
 	case "$board" in
 	"linksys,audi"|\
 	"linksys,viper")
-		platform_do_upgrade_linksys "$ARGV"
+		platform_do_upgrade_linksys "$1"
 		;;
 	*)
-		nand_do_upgrade "$ARGV"
+		nand_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/base-files/lib/upgrade/platform.sh
index 840ebe7e47..c47ff78fb2 100755
--- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh
+++ b/target/linux/lantiq/base-files/lib/upgrade/platform.sh
@@ -21,7 +21,7 @@ platform_do_upgrade() {
 		nand_do_upgrade $1
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/layerscape/base-files/lib/upgrade/platform.sh b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
index 1c924997e6..3bbf6f3dc6 100644
--- a/target/linux/layerscape/base-files/lib/upgrade/platform.sh
+++ b/target/linux/layerscape/base-files/lib/upgrade/platform.sh
@@ -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"
diff --git a/target/linux/mediatek/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/base-files/lib/upgrade/platform.sh
index 487a262dc2..d812a48720 100755
--- a/target/linux/mediatek/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/base-files/lib/upgrade/platform.sh
@@ -19,7 +19,7 @@ platform_do_upgrade() {
 		umount /tmp/recovery
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
index 0e9a68ebdf..064eeb35bc 100755
--- a/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mpc85xx/base-files/lib/upgrade/platform.sh
@@ -15,10 +15,10 @@ platform_do_upgrade() {
 	case "$board" in
 	ocedo,panda|\
 	sophos,red-15w-rev1)
-		nand_do_upgrade "$ARGV"
+		nand_do_upgrade "$1"
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/mvebu/base-files/lib/upgrade/platform.sh b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
index 6550dd59b7..3fc4ff6635 100755
--- a/target/linux/mvebu/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/platform.sh
@@ -22,14 +22,14 @@ platform_check_image() {
 platform_do_upgrade() {
 	case "$(board_name)" in
 	linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom)
-		platform_do_upgrade_linksys "$ARGV"
+		platform_do_upgrade_linksys "$1"
 		;;
 	cznic,turris-omnia|globalscale,espressobin|globalscale,espressobin-emmc|globalscale,espressobin-v7|globalscale,espressobin-v7-emmc|\
 	marvell,armada8040-mcbin|solidrun,clearfog-base-a1|solidrun,clearfog-pro-a1)
-		platform_do_upgrade_sdcard "$ARGV"
+		platform_do_upgrade_sdcard "$1"
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 4eaaffe029..ae7a72c649 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -15,7 +15,7 @@ platform_nand_pre_upgrade() {
 	case "$board" in
 	ubiquiti,edgerouterx|\
 	ubiquiti,edgerouterx-sfp)
-		platform_upgrade_ubnt_erx "$ARGV"
+		platform_upgrade_ubnt_erx "$1"
 		;;
 	esac
 }
@@ -39,14 +39,14 @@ platform_do_upgrade() {
 	ubiquiti,edgerouterx-sfp|\
 	xiaomi,mir3g|\
 	xiaomi,mir3p)
-		nand_do_upgrade "$ARGV"
+		nand_do_upgrade "$1"
 		;;
 	tplink,archer-c50-v4)
 		MTD_ARGS="-t romfile"
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	*)
-		default_do_upgrade "$ARGV"
+		default_do_upgrade "$1"
 		;;
 	esac
 }
-- 
2.21.0


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

More information about the openwrt-devel mailing list