| Message ID | 20200320153505.3112143-1-m.niestroj@grinn-global.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] board/chiliboard: drop custom post-image script | expand |
Marcin, All, On 2020-03-20 16:35 +0100, Marcin Niestroj spake thusly: > Instead use generic genimage.sh script. > > Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> Series applied to master, thanks. Regards, Yann E. MORIN. > --- > board/grinn/chiliboard/post-image.sh | 14 -------------- > configs/grinn_chiliboard_defconfig | 3 ++- > 2 files changed, 2 insertions(+), 15 deletions(-) > delete mode 100755 board/grinn/chiliboard/post-image.sh > > diff --git a/board/grinn/chiliboard/post-image.sh b/board/grinn/chiliboard/post-image.sh > deleted file mode 100755 > index 1a076eecb8..0000000000 > --- a/board/grinn/chiliboard/post-image.sh > +++ /dev/null > @@ -1,14 +0,0 @@ > -#!/usr/bin/env bash > - > -BOARD_DIR="$(dirname $0)" > -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" > -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" > - > -rm -rf "${GENIMAGE_TMP}" > - > -genimage \ > - --rootpath "${TARGET_DIR}" \ > - --tmppath "${GENIMAGE_TMP}" \ > - --inputpath "${BINARIES_DIR}" \ > - --outputpath "${BINARIES_DIR}" \ > - --config "${GENIMAGE_CFG}" > diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig > index ab89bbf8f3..f3edf90de4 100644 > --- a/configs/grinn_chiliboard_defconfig > +++ b/configs/grinn_chiliboard_defconfig > @@ -2,7 +2,8 @@ BR2_arm=y > BR2_cortex_a8=y > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y > BR2_SYSTEM_DHCP="eth0" > -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/chiliboard/post-image.sh" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/chiliboard/genimage.cfg" > BR2_LINUX_KERNEL=y > BR2_LINUX_KERNEL_CUSTOM_VERSION=y > BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1" > -- > 2.25.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/board/grinn/chiliboard/post-image.sh b/board/grinn/chiliboard/post-image.sh deleted file mode 100755 index 1a076eecb8..0000000000 --- a/board/grinn/chiliboard/post-image.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index ab89bbf8f3..f3edf90de4 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -2,7 +2,8 @@ BR2_arm=y BR2_cortex_a8=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/chiliboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/grinn/chiliboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1"
Instead use generic genimage.sh script. Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com> --- board/grinn/chiliboard/post-image.sh | 14 -------------- configs/grinn_chiliboard_defconfig | 3 ++- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100755 board/grinn/chiliboard/post-image.sh