rpi-config: fix invalid shell variable name
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
@@ -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
@@ -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
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.Signed-off-by Andrea Galbusera <[email protected]>---
v2: also update README accordingly
Signed-off-by Andrea Galbusera <[email protected]>--- README | 2 +- recipes-bsp/bootfiles/rpi-config_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)README +1
-1@@ -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
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 :)
Andrei Gherzan
AppliedQuoted 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.Signed-off-by Andrea Galbusera <[email protected]>---
v2: also update README accordingly
Signed-off-by Andrea Galbusera <[email protected]>--- README | 2 +- recipes-bsp/bootfiles/rpi-config_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)README +1
-1@@ -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@@ -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