From ba7803e5138ae0295362b16c93eab5e3ec0cb6bd Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 31 Mar 2022 19:31:15 +0100 Subject: [PATCH] CI: clean up assignments in base.yml Split the base local.conf configuration into base (absolutely needed) and setup (typical configuration). This is needed as oe-selftest needs a minimal configuration to execute in, for example doesn't inherit rm_work. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- ci/base.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/base.yml b/ci/base.yml index 9a59de79..eb5637d4 100644 --- a/ci/base.yml +++ b/ci/base.yml @@ -28,15 +28,15 @@ local_conf_header: base: | BB_SERVER_TIMEOUT = "60" CONF_VERSION = "2" - PACKAGE_CLASSES = "package_ipk" - LICENSE_FLAGS_ACCEPTED += "armcompiler Arm-FVP-EULA" - PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" - EXTRA_IMAGE_FEATURES:append = " debug-tweaks" BB_NUMBER_THREADS = "16" PARALLEL_MAKE = "-j16" - INHERIT += "rm_work" + LICENSE_FLAGS_ACCEPTED += "armcompiler Arm-FVP-EULA" + setup: | + PACKAGE_CLASSES = "package_ipk" + PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" + EXTRA_IMAGE_FEATURES:append = " debug-tweaks" PACKAGECONFIG:append:pn-perf = " coresight" - noptest: | + INHERIT += "rm_work" DISTRO_FEATURES:remove = "ptest" kvm: | QEMU_USE_KVM = ""