From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Date: Fri, 23 Sep 2016 22:07:25 +0000 (+0200)
Subject: lantiq: do not "local" variables outside of a function
X-Git-Tag: v17.01.0-rc1~1397
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e9de6e5203c02660451f9f1634c87246871106be;p=openwrt%2Fstaging%2Fxback.git

lantiq: do not "local" variables outside of a function

Older busybox versions allowed using the local keyword outside of
functions, whereas 1.25.0 (which was introduced in 06fa1c46fc32) do not
allow this anymore (leading to the following error when executing the
script: "file: local: line nn: not in a function").

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---

diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
index da10797381..3aa5de4d60 100644
--- a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
+++ b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
@@ -33,7 +33,7 @@ rt2x00_eeprom_extract() {
 
 case "$FIRMWARE" in
 "RT2860.eeprom" )
-	local board=$(lantiq_board_name)
+	board=$(lantiq_board_name)
 	case $board in
 	ARV7506PW11|ARV7510PW22|ARV7519PW|ARV752DPW|ARV752DPW22|VGV7519)
 		rt2x00_eeprom_extract "board_config" 520 256 1
@@ -47,7 +47,7 @@ case "$FIRMWARE" in
 	esac
 	;;
 "RT3062.eeprom" )
-	local board=$(lantiq_board_name)
+	board=$(lantiq_board_name)
 	case $board in
 	VGV7510KW22)
 		rt2x00_eeprom_extract "board_config" 520 256 1
diff --git a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index 0d8084fa10..dc95da78a5 100644
--- a/target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -35,11 +35,11 @@ ath10k_caldata_set_macaddr() {
 
 case "$FIRMWARE" in
 "ath10k/cal-pci-0000:02:00.0.bin")
-	local board=$(lantiq_board_name)
+	board=$(lantiq_board_name)
 	case $board in
 		BTHOMEHUBV5A)
-			local lan_mac=$(mtd_get_mac_binary caldata 4364)
-			local wifi_mac=$(macaddr_add "$lan_mac" 3)
+			lan_mac=$(mtd_get_mac_binary caldata 4364)
+			wifi_mac=$(macaddr_add "$lan_mac" 3)
 			ath10k_caldata_extract "caldata" 20480
 			ath10k_caldata_set_macaddr $wifi_mac
 			;;