Pull request #45: Fix/container machine
Merge in ICO/coreos from fix/container-machine to master * commit '342f288d041050a84ecfa14bcc2c720f642f173d': chore(container): remove the container machine overrides fix(container): fix build failure with container machines with coreos-image class
This commit is contained in:
commit
55c6fcddde
|
|
@ -2,8 +2,10 @@
|
||||||
IMAGE_FSTYPES += "container oci"
|
IMAGE_FSTYPES += "container oci"
|
||||||
IMGCLASSES:append = " image-oci"
|
IMGCLASSES:append = " image-oci"
|
||||||
|
|
||||||
# Add an override that work for all container image
|
|
||||||
MACHINEOVERRIDES =. "container:"
|
|
||||||
|
|
||||||
# Containers don't need a kernel
|
# Containers don't need a kernel
|
||||||
PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
|
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"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue