[Buildroot] [PATCH] configs/at91: refactor to use genimage.sh

Ludovic Desroches ludovic.desroches at microchip.com
Fri Nov 10 08:10:19 UTC 2017


On Wed, Nov 08, 2017 at 11:15:21AM -0700, Joshua Henderson wrote:
> Prefer the commom genimage.sh instead of a custom post-image.sh script.
> 
> Cc: Ludovic Desroches <ludovic.desroches at atmel.com>
> Cc: Peter Korsgaard <peter at korsgaard.com>
> Signed-off-by: Joshua Henderson <joshua.henderson at microchip.com>

I am not sure it's useful to split this refactoring. I may squash both
patches. Otherwise,

Acked-by: Ludovic Desroches <ludovic.desroches at microchip.com>

> ---
>  board/atmel/at91sam9x5ek_mmc/post-image.sh | 20 --------------------
>  configs/at91sam9x5ek_mmc_defconfig         |  3 ++-
>  configs/at91sam9x5ek_mmc_dev_defconfig     |  3 ++-
>  3 files changed, 4 insertions(+), 22 deletions(-)
>  delete mode 100755 board/atmel/at91sam9x5ek_mmc/post-image.sh
> 
> diff --git a/board/atmel/at91sam9x5ek_mmc/post-image.sh b/board/atmel/at91sam9x5ek_mmc/post-image.sh
> deleted file mode 100755
> index b560fd3..0000000
> --- a/board/atmel/at91sam9x5ek_mmc/post-image.sh
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -#!/bin/sh
> -
> -BOARD_DIR="$(dirname $0)"
> -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
> -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
> -
> -rm -rf "${GENIMAGE_TMP}"
> -
> -echo --rootpath "${TARGET_DIR}"
> -echo --tmppath "${GENIMAGE_TMP}"
> -echo --inputpath "${BINARIES_DIR}"
> -echo --outputpath "${BINARIES_DIR}"
> -echo --config "${GENIMAGE_CFG}"
> -
> -genimage                               \
> -	--rootpath "${TARGET_DIR}"     \
> -	--tmppath "${GENIMAGE_TMP}"    \
> -	--inputpath "${BINARIES_DIR}"  \
> -	--outputpath "${BINARIES_DIR}" \
> -	--config "${GENIMAGE_CFG}"
> diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
> index 5ccbdb9..6964d58 100644
> --- a/configs/at91sam9x5ek_mmc_defconfig
> +++ b/configs/at91sam9x5ek_mmc_defconfig
> @@ -6,7 +6,8 @@ BR2_arm926t=y
>  BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
>  
>  # Creation of the SD card image
> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
>  
>  # Kernel
>  BR2_LINUX_KERNEL=y
> diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig
> index e84bae3..931cf7d 100644
> --- a/configs/at91sam9x5ek_mmc_dev_defconfig
> +++ b/configs/at91sam9x5ek_mmc_dev_defconfig
> @@ -15,7 +15,8 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
>  # Needed for usb-utils
>  BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
>  # Creation of the SD card image
> -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/at91sam9x5ek_mmc/post-image.sh"
> +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
> +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
>  
>  # Kernel
>  BR2_LINUX_KERNEL=y
> -- 
> 2.7.4
> 



More information about the buildroot mailing list