lantiq: do not "local" variables outside of a function
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Fri, 23 Sep 2016 22:07:25 +0000 (00:07 +0200)
committerDaniel Golle <daniel@makrotopia.org>
Fri, 23 Sep 2016 23:17:17 +0000 (01:17 +0200)
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>
target/linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom
target/linux/lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata

index da10797..3aa5de4 100644 (file)
@@ -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
index 0d8084f..dc95da7 100644 (file)
@@ -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
                        ;;