From 7f383ac3f0a737f49bb839908d3dd0e4208c27fe Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sat, 12 Oct 2019 21:22:25 -0300 Subject: [PATCH] configs/beagleboardx15: drop custom post-image script Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Signed-off-by: Carlos Santos Signed-off-by: Thomas Petazzoni --- board/beagleboardx15/post-image.sh | 15 --------------- configs/beagleboardx15_defconfig | 3 ++- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100755 board/beagleboardx15/post-image.sh diff --git a/board/beagleboardx15/post-image.sh b/board/beagleboardx15/post-image.sh deleted file mode 100755 index f52682f5d5..0000000000 --- a/board/beagleboardx15/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -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/beagleboardx15_defconfig b/configs/beagleboardx15_defconfig index 393b29eef0..039a07b11e 100644 --- a/configs/beagleboardx15_defconfig +++ b/configs/beagleboardx15_defconfig @@ -1,7 +1,8 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboardx15/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboardx15/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" -- 2.30.2