From 89d820d4a63b0e19462d84479931d9d63c4bb186 Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 2 Feb 2023 10:11:06 +0100 Subject: [PATCH 1/2] fix(container): fix build failure with container machines with coreos-image class --- .../machine/include/coreos-generic-machine/container.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc index 6703b00..2e29c0e 100644 --- a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc +++ b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc @@ -7,3 +7,8 @@ MACHINEOVERRIDES =. "container:" # Containers don't need a kernel PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" + +# When using coreos-image instead of coreos-container-image, we should skip +# swu image generation and unified kernel image generation +COREOS_IMAGE_GENERATE_UKI = "0" +COREOS_IMAGE_GENERATE_SWU = "0" From 342f288d041050a84ecfa14bcc2c720f642f173d Mon Sep 17 00:00:00 2001 From: Samuel Dolt Date: Thu, 2 Feb 2023 10:12:00 +0100 Subject: [PATCH 2/2] chore(container): remove the container machine overrides We can build container with non-container machine with coreos-container-image classes so having a MACHINEOVERRIDES for container machines only is misleading --- .../conf/machine/include/coreos-generic-machine/container.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc index 2e29c0e..dc83266 100644 --- a/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc +++ b/layers/meta-belden-coreos-bsp/conf/machine/include/coreos-generic-machine/container.inc @@ -2,9 +2,6 @@ IMAGE_FSTYPES += "container oci" IMGCLASSES:append = " image-oci" -# Add an override that work for all container image -MACHINEOVERRIDES =. "container:" - # Containers don't need a kernel PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"