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 06fa1c46fc) 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>
This commit is contained in:
Martin Blumenstingl 2016-09-24 00:07:25 +02:00 committed by Daniel Golle
parent 6177b649ca
commit e9de6e5203
2 changed files with 5 additions and 5 deletions

View File

@ -33,7 +33,7 @@ rt2x00_eeprom_extract() {
case "$FIRMWARE" in case "$FIRMWARE" in
"RT2860.eeprom" ) "RT2860.eeprom" )
local board=$(lantiq_board_name) board=$(lantiq_board_name)
case $board in case $board in
ARV7506PW11|ARV7510PW22|ARV7519PW|ARV752DPW|ARV752DPW22|VGV7519) ARV7506PW11|ARV7510PW22|ARV7519PW|ARV752DPW|ARV752DPW22|VGV7519)
rt2x00_eeprom_extract "board_config" 520 256 1 rt2x00_eeprom_extract "board_config" 520 256 1
@ -47,7 +47,7 @@ case "$FIRMWARE" in
esac esac
;; ;;
"RT3062.eeprom" ) "RT3062.eeprom" )
local board=$(lantiq_board_name) board=$(lantiq_board_name)
case $board in case $board in
VGV7510KW22) VGV7510KW22)
rt2x00_eeprom_extract "board_config" 520 256 1 rt2x00_eeprom_extract "board_config" 520 256 1

View File

@ -35,11 +35,11 @@ ath10k_caldata_set_macaddr() {
case "$FIRMWARE" in case "$FIRMWARE" in
"ath10k/cal-pci-0000:02:00.0.bin") "ath10k/cal-pci-0000:02:00.0.bin")
local board=$(lantiq_board_name) board=$(lantiq_board_name)
case $board in case $board in
BTHOMEHUBV5A) BTHOMEHUBV5A)
local lan_mac=$(mtd_get_mac_binary caldata 4364) lan_mac=$(mtd_get_mac_binary caldata 4364)
local wifi_mac=$(macaddr_add "$lan_mac" 3) wifi_mac=$(macaddr_add "$lan_mac" 3)
ath10k_caldata_extract "caldata" 20480 ath10k_caldata_extract "caldata" 20480
ath10k_caldata_set_macaddr $wifi_mac ath10k_caldata_set_macaddr $wifi_mac
;; ;;