aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorGravatar Gaël PORTAY <gael.portay@savoirfairelinux.com>2017-10-21 09:52:14 -0400
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-10-21 21:37:10 +0200
commitd0b055239e10898b87ff8af02f8c4bd14426e3e7 (patch)
treec475b74213f3792e356dc09b9f3cce95509e82b9 /board
parent0629eb8449f1fdbcfc892722fee262a400b9e6c2 (diff)
downloadbuildroot-d0b055239e10898b87ff8af02f8c4bd14426e3e7.tar.gz
buildroot-d0b055239e10898b87ff8af02f8c4bd14426e3e7.tar.bz2
raspberrypi: post-image.sh fix gpu_mem option
The gpu_mem option is not using the proper option argument which causes sed to fail. + case "${arg}" in + gpu_mem=ome/gportay/output-rpi3-qtwe/images + sed -e '/^ome/gportay/output-rpi3-qtwe/images=/s,=.*,=ome/gportay/output-rpi3-qtwe/images,' -i /home/gportay/output-rpi3-qtwe/images/rpi-firmware/config.txt sed: -e expression #1, char 8: extra characters after command + case "${arg}" in + gpu_mem=ome/gportay/output-rpi3-qtwe/images + sed -e '/^ome/gportay/output-rpi3-qtwe/images=/s,=.*,=ome/gportay/output-rpi3-qtwe/images,' -i /home/gportay/output-rpi3-qtwe/images/rpi-firmware/config.txt sed: -e expression #1, char 8: extra characters after command The issue comes from the use of $1 instead of $arg to extract the gpu_mem value. $1 is the $(BINARIES_DIR) which leads to a sed expression error. Also, it adds the error flag to the shell script to prevent from such situation and terminate the build in error. Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'board')
-rwxr-xr-xboard/raspberrypi/post-image.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh
index a2d6a98e79..3c6c938407 100755
--- a/board/raspberrypi/post-image.sh
+++ b/board/raspberrypi/post-image.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e
+
BOARD_DIR="$(dirname $0)"
BOARD_NAME="$(basename ${BOARD_DIR})"
GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
@@ -40,7 +42,7 @@ __EOF__
;;
--gpu_mem_256=*|--gpu_mem_512=*|--gpu_mem_1024=*)
# Set GPU memory
- gpu_mem="${1:2}"
+ gpu_mem="${arg:2}"
sed -e "/^${gpu_mem%=*}=/s,=.*,=${gpu_mem##*=}," -i "${BINARIES_DIR}/rpi-firmware/config.txt"
;;
esac