[LEDE-DEV] [PATCH 2/2] lantiq: do not "local" variables outside of a function
Martin Blumenstingl
martin.blumenstingl at googlemail.com
Fri Sep 23 15:07:25 PDT 2016
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 at googlemail.com>
---
.../linux/lantiq/base-files/etc/hotplug.d/firmware/10-rt2x00-eeprom | 4 ++--
.../lantiq/base-files/etc/hotplug.d/firmware/11-ath10k-caldata | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
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 da10797..3aa5de4 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 0d8084f..dc95da7 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
;;
--
2.10.0
More information about the Lede-dev
mailing list