From d0b055239e10898b87ff8af02f8c4bd14426e3e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ga=C3=ABl=20PORTAY?= Date: Sat, 21 Oct 2017 09:52:14 -0400 Subject: [PATCH] raspberrypi: post-image.sh fix gpu_mem option MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- board/raspberrypi/post-image.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- 2.30.2