Skip to contentSkip to conversation

rpi-config: fix invalid shell variable name

PATCH Applied Andrea Galbusera 3 participants 3 messages Apr 4, 2017 – Apr 5, 2017

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 rpi-config: fix invalid shell variable name

Commit da32aac introduced an invalid shell variable name in do_deploy():
according to bash manpage variable names cannot contain dots. Replace dot with underscore to fix it.

---

v2: also update README accordingly

---
 README                                  | 2 +-
 recipes-bsp/bootfiles/rpi-config_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
README +1 -1
index c58bc99..9fdd5eb 100644
@@ -247,7 +247,7 @@ List of currently supported models:
 If you would like to use the Waveshare "C" 1024×600, 7 inch Capacitive Touch
 Screen LCD, HDMI interface (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
 Rev 2.1, please set the following in your local.conf
-WAVESHARE_1024X600_C_2.1 = "1"
+WAVESHARE_1024X600_C_2_1 = "1"
 
 3.P. Enable UART
 ===============
recipes-bsp/bootfiles/rpi-config_git.bb +1 -1
index 8adc938..af55983 100644
@@ -112,7 +112,7 @@ do_deploy() {
     fi
 
     # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
-    if [ "${WAVESHARE_1024X600_C_2.1}" = "1" ]; then
+    if [ "${WAVESHARE_1024X600_C_2_1}" = "1" ]; then
         echo "# Waveshare \"C\" 1024x600 7\" Rev2.1 IPS capacitive touch screen" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "max_usb_current=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "hdmi_group=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
Signature · 1 line
2.7.4
#1 lore raw
Quoted 32 lines · On Tue, 4 Apr 2017 19:35:50 +0200 Andrea Galbusera <[email protected]> wrote:

Commit da32aac introduced an invalid shell variable name in do_deploy():
according to bash manpage variable names cannot contain dots. Replace dot with underscore to fix it.

---

v2: also update README accordingly

---
 README                                  | 2 +-
 recipes-bsp/bootfiles/rpi-config_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
README +1 -1
index c58bc99..9fdd5eb 100644
@@ -247,7 +247,7 @@ List of currently supported models:
 If you would like to use the Waveshare "C" 1024×600, 7 inch Capacitive Touch
 Screen LCD, HDMI interface (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
 Rev 2.1, please set the following in your local.conf
-WAVESHARE_1024X600_C_2.1 = "1"
+WAVESHARE_1024X600_C_2_1 = "1"
 
 3.P. Enable UART
 ===============
recipes-bsp/bootfiles/rpi-config_git.bb +0 -0
index 8adc938..af55983 100644

recipes-bsp/bootfiles/rpi-config_git.bb do_deploy() { · line 118

Quoted 8 lines
recipes-bsp/bootfiles/rpi-config_git.bb +1 -1
@@ -112,7 +112,7 @@ do_deploy() {
     fi
 
     # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
-    if [ "${WAVESHARE_1024X600_C_2.1}" = "1" ]; then
+    if [ "${WAVESHARE_1024X600_C_2_1}" = "1" ]; then
         echo "# Waveshare \"C\" 1024x600 7\" Rev2.1 IPS capacitive touch screen" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "max_usb_current=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "hdmi_group=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt

This fixes the build for me and looks good :)

#2 lore raw
In reply to Andrea Galbusera
Quoted 43 lines · Andrea Galbusera

Commit da32aac introduced an invalid shell variable name in do_deploy():
according to bash manpage variable names cannot contain dots. Replace dot with underscore to fix it.

---

v2: also update README accordingly

---
 README                                  | 2 +-
 recipes-bsp/bootfiles/rpi-config_git.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
README +1 -1
index c58bc99..9fdd5eb 100644
@@ -247,7 +247,7 @@ List of currently supported models:
 If you would like to use the Waveshare "C" 1024×600, 7 inch Capacitive Touch
 Screen LCD, HDMI interface (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
 Rev 2.1, please set the following in your local.conf
-WAVESHARE_1024X600_C_2.1 = "1"
+WAVESHARE_1024X600_C_2_1 = "1"
 
 3.P. Enable UART
 ===============
recipes-bsp/bootfiles/rpi-config_git.bb +1 -2
index 8adc938..af55983 100644
@@ -112,7 +112,7 @@ do_deploy() {
     fi
 
     # Waveshare "C" 1024x600 7" Rev2.1 IPS capacitive touch (http://www.waveshare.com/7inch-HDMI-LCD-C.htm)
-    if [ "${WAVESHARE_1024X600_C_2.1}" = "1" ]; then
+    if [ "${WAVESHARE_1024X600_C_2_1}" = "1" ]; then
         echo "# Waveshare \"C\" 1024x600 7\" Rev2.1 IPS capacitive touch screen" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "max_usb_current=1" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
         echo "hdmi_group=2" >> ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
--

2.7.4

Quoted 5 lines

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Merged to master. Thanks.

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan