Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v1 1/1] board/zynqmp: fix shellcheck issues
@ 2023-06-06 17:54 Neal Frager via buildroot
  2023-06-06 19:40 ` Peter Korsgaard
  0 siblings, 1 reply; 3+ messages in thread
From: Neal Frager via buildroot @ 2023-06-06 17:54 UTC (permalink / raw)
  To: buildroot; +Cc: thomas.petazzoni, Neal Frager, michal.simek, luca.ceresoli

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
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
 	label linux
 	  kernel /Image
 	  devicetree /system.dtb
-	  append console=${CONSOLE} root=/dev/${ROOT} rw rootwait
+	  append console="${CONSOLE}" root=/dev/"${ROOT}" rw rootwait
 	__HEADER_EOF
diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh
index c5de2db820..ecf6032fce 100755
--- a/board/zynqmp/post-image.sh
+++ b/board/zynqmp/post-image.sh
@@ -6,10 +6,10 @@
 
 FIRST_DT=$(sed -nr \
                -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \
-               ${BR2_CONFIG})
+               "${BR2_CONFIG}")
 
-[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb
+[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}".dtb "${BINARIES_DIR}"/system.dtb
 
-BOARD_DIR="$(dirname $0)"
+BOARD_DIR="$(dirname "$0")"
 
-support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg
+support/scripts/genimage.sh -c "${BOARD_DIR}"/genimage.cfg
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] board/zynqmp: fix shellcheck issues
  2023-06-06 17:54 [Buildroot] [PATCH v1 1/1] board/zynqmp: fix shellcheck issues Neal Frager via buildroot
@ 2023-06-06 19:40 ` Peter Korsgaard
  2023-06-14 13:52   ` Peter Korsgaard
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2023-06-06 19:40 UTC (permalink / raw)
  To: Neal Frager; +Cc: michal.simek, luca.ceresoli, thomas.petazzoni, buildroot

>>>>> "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

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] board/zynqmp: fix shellcheck issues
  2023-06-06 19:40 ` Peter Korsgaard
@ 2023-06-14 13:52   ` Peter Korsgaard
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2023-06-14 13:52 UTC (permalink / raw)
  To: Neal Frager; +Cc: luca.ceresoli, michal.simek, thomas.petazzoni, buildroot

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "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.

Committed to 2023.02.x, thanks.

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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-14 13:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-06 17:54 [Buildroot] [PATCH v1 1/1] board/zynqmp: fix shellcheck issues Neal Frager via buildroot
2023-06-06 19:40 ` Peter Korsgaard
2023-06-14 13:52   ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox