From 4cc1a14a8727b3b87b55636942e3df87d6ca212f Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 26 Jan 2023 15:58:04 +0100 Subject: [PATCH] configs: fix .gns3a file generation, missing rw.ext4 Sync amd64 build with genimage support from aarch64. Signed-off-by: Joachim Wiberg --- board/amd64/genimage.cfg | 10 ++++++++++ configs/amd64_defconfig | 6 ++++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 board/amd64/genimage.cfg diff --git a/board/amd64/genimage.cfg b/board/amd64/genimage.cfg new file mode 100644 index 00000000..52c471ab --- /dev/null +++ b/board/amd64/genimage.cfg @@ -0,0 +1,10 @@ +image rw.ext4 { + ext4 { + label = "infix-rw" + } + empty = true + size = 16M +} + +# Silence genimage warnings +config {} diff --git a/configs/amd64_defconfig b/configs/amd64_defconfig index 0cf4a6f3..47bc5263 100644 --- a/configs/amd64_defconfig +++ b/configs/amd64_defconfig @@ -21,8 +21,8 @@ BR2_TARGET_TZ_INFO=y BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_INFIX_PATH)/board/common/users" BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL_INFIX_PATH)/board/common/rootfs" BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh $(BR2_EXTERNAL_INFIX_PATH)/board/common/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh $(BR2_EXTERNAL_INFIX_PATH)/board/common/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" +BR2_ROOTFS_POST_IMAGE_SCRIPT="$(TOPDIR)/support/scripts/genimage.sh $(BR2_EXTERNAL_INFIX_PATH)/board/common/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/amd64/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.19.17" @@ -101,6 +101,8 @@ BR2_TARGET_SYSLINUX_ISOLINUX=y BR2_TARGET_SYSLINUX_MBR=y BR2_TARGET_SYSLINUX_C32="dmi.c32 libcom32.c32 libgpl.c32 liblua.c32 libutil.c32 lua.c32 menu.c32 syslinux.c32" BR2_PACKAGE_HOST_ENVIRONMENT_SETUP=y +BR2_PACKAGE_HOST_GENEXT2FS=y +BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_FACTORY=y BR2_PACKAGE_FINIT_SULOGIN=y BR2_PACKAGE_FINIT_PLUGIN_HOTPLUG=y