From 19844a3e03aae9e4c28f21fd52c99e2f5b7865b4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 7 Apr 2022 17:21:54 +0100 Subject: [PATCH] config.json: rewrite meta-virt build steps In the meta-virt builder, don't do a world build but instead build just xen-image-minimal for both qemuarm64 and qemux86-64. This can be expanded over time, but is a sensible starting point and builds cleanly. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- config.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/config.json b/config.json index 5b4a59e..93fd6a5 100644 --- a/config.json +++ b/config.json @@ -934,8 +934,6 @@ }, "meta-virt" : { "NEEDREPOS" : ["poky", "meta-openembedded", "meta-virtualization"], - "MACHINE" : "qemux86-64", - "BBTARGETS" : "world -k", "ADDLAYER" : [ "${BUILDDIR}/../meta-openembedded/meta-oe", "${BUILDDIR}/../meta-openembedded/meta-python", @@ -944,8 +942,18 @@ "${BUILDDIR}/../meta-virtualization" ], "extravars" : [ - "DISTRO_FEATURES:append = ' virtualization'" - ] + "DISTRO_FEATURES:append = ' virtualization xen'" + ], + "step1" : { + "shortname": "Xen for qemux86-64", + "MACHINE": "qemux86-64", + "BBTARGETS" : "xen-image-minimal" + }, + "step2" : { + "shortname": "Xen for qemuarm64", + "MACHINE": "qemuarm64", + "BBTARGETS" : "xen-image-minimal" + } }, "qa-extras" : { "MACHINE" : "qemux86-64",