From cc174ad1d0943c933e76596b1078c047ce71fd04 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 31 Dec 2021 12:33:21 +0100 Subject: [PATCH] x86: copy separate kernel and rootfs images to "other" directory For regular use, a full disk image is always recommended, as it is required to support sysupgrades. During development or for automated tests, separate images for the kernel and rootfs may be useful to pass additional kernel cmdline or use nfsroot/virtiofs. The rootfs is only available as a (squashfs) filesystem image, not as a TAR archive (the TAR archive in OpenWrt's bin directory does not contain DEVICE_PACKAGES, so it is missing most of Gluon's packages). --- targets/x86-64 | 7 ++++++- targets/x86-generic | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/targets/x86-64 b/targets/x86-64 index 8899f851..288e3d50 100644 --- a/targets/x86-64 +++ b/targets/x86-64 @@ -6,4 +6,9 @@ packages { 'kmod-pcengines-apuv2', } -device('x86-64', 'generic') +device('x86-64', 'generic', { + extra_images = { + {'-kernel', '-kernel', '.bin'}, + {'-squashfs-rootfs', '-rootfs', '.img.gz'}, + }, +}) diff --git a/targets/x86-generic b/targets/x86-generic index 856d4a40..bee0bd95 100644 --- a/targets/x86-generic +++ b/targets/x86-generic @@ -7,6 +7,10 @@ packages { } device('x86-generic', 'generic', { + extra_images = { + {'-kernel', '-kernel', '.bin'}, + {'-squashfs-rootfs', '-rootfs', '.img.gz'}, + }, manifest_aliases = { 'x86-kvm', 'x86-xen_domu',