Re: [Buildroot] [PATCH v1 1/1] board/zynqmp: fix shellcheck issues

From: Peter Korsgaard <peter@korsgaard.com>
To: Neal Frager <neal.frager@amd.com>
Cc: michal.simek@amd.com, luca.ceresoli@bootlin.com,
	thomas.petazzoni@bootlin.com, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v1 1/1] board/zynqmp: fix shellcheck issues
Date: Tue, 06 Jun 2023 21:40:13 +0200	[thread overview]
Message-ID: <87legw4bxe.fsf@48ers.dk> (raw)
In-Reply-To: <20230606175459.21887-1-neal.frager@amd.com> (Neal Frager's message of "Tue, 6 Jun 2023 18:54:59 +0100")

>>>>> "Neal" == Neal Frager <neal.frager@amd.com> writes:

 > This patch cleans up board/zynqmp shellcheck issues.
 > Signed-off-by: Neal Frager <neal.frager@amd.com>
 > ---
 >  .checkpackageignore              | 3 ---
 >  board/zynqmp/kria/kv260/kv260.sh | 6 +++---
 >  board/zynqmp/post-build.sh       | 9 ++++-----
 >  board/zynqmp/post-image.sh       | 8 ++++----
 >  4 files changed, 11 insertions(+), 15 deletions(-)

 > diff --git a/.checkpackageignore b/.checkpackageignore
 > index 10e70f0787..8d41aa2d37 100644
 > --- a/.checkpackageignore
 > +++ b/.checkpackageignore
 > @@ -103,10 +103,7 @@ board/versal/post-build.sh Shellcheck
 >  board/versal/post-image.sh Shellcheck TrailingSpace
 >  board/zynq/post-build.sh Shellcheck
 >  board/zynq/post-image.sh Shellcheck
 > -board/zynqmp/kria/kv260/kv260.sh Shellcheck
 >  board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream
 > -board/zynqmp/post-build.sh Shellcheck
 > -board/zynqmp/post-image.sh Shellcheck
 >  boot/afboot-stm32/0003-Makefile-disable-stack-protector.patch Upstream
 >  boot/at91bootstrap/0001-eabi-fix.patch Upstream
 >  boot/at91bootstrap/0002-gcc-4.6.x-ldscript-fix.patch Upstream
 > diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh
 > index e03d67d8b0..089c1ea58f 100755
 > --- a/board/zynqmp/kria/kv260/kv260.sh
 > +++ b/board/zynqmp/kria/kv260/kv260.sh
 > @@ -6,7 +6,7 @@
 >  # drivers are missing.
 >  # This will be removed when u-boot can build the kv260 u-boot.itb natively.

 > -UBOOT_DIR=$4
 > +UBOOT_DIR="$4"

 > -fdtoverlay -o ${UBOOT_DIR}/fit-dtb.blob -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo
 > -${UBOOT_DIR}/tools/mkimage -E -f ${UBOOT_DIR}/u-boot.its -B 0x8 ${BINARIES_DIR}/u-boot.itb
 > +fdtoverlay -o "${UBOOT_DIR}"/fit-dtb.blob -i "${UBOOT_DIR}"/arch/arm/dts/zynqmp-smk-k26-revA.dtb "${UBOOT_DIR}"/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo
 > +"${UBOOT_DIR}"/tools/mkimage -E -f "${UBOOT_DIR}"/u-boot.its -B 0x8 "${BINARIES_DIR}"/u-boot.itb

I took the liberty to wrap some of these very long lines.

> diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh
 > index 0713bd1b05..d373ff4d4c 100755
 > --- a/board/zynqmp/post-build.sh
 > +++ b/board/zynqmp/post-build.sh
 > @@ -3,14 +3,13 @@
 >  # genimage will need to find the extlinux.conf
 >  # in the binaries directory

 > -BOARD_DIR="$(dirname $0)"
 > -CONSOLE=$2
 > -ROOT=$3
 > +CONSOLE="$2"
 > +ROOT="$3"

 >  mkdir -p "${BINARIES_DIR}"
 > -cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf"
 > +cat <<-__HEADER_EOF > "${BINARIES_DIR}"/extlinux.conf

The previous format was better (and my shellcheck doesn't complain about
it), so I've dropped this.

Committed with that fixed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot