diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/include/k8s-versions.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/meta-virt-container.inc | 40 | ||||
| -rw-r--r-- | conf/distro/include/meta-virt-default-versions.inc | 9 | ||||
| -rw-r--r-- | conf/distro/include/meta-virt-xen.inc | 15 | ||||
| -rw-r--r-- | conf/distro/include/virt_security_flags.inc | 4 |
5 files changed, 60 insertions, 9 deletions
diff --git a/conf/distro/include/k8s-versions.inc b/conf/distro/include/k8s-versions.inc new file mode 100644 index 00000000..b4ec6b63 --- /dev/null +++ b/conf/distro/include/k8s-versions.inc @@ -0,0 +1 @@ +# placeholder for k8s specific versions diff --git a/conf/distro/include/meta-virt-container.inc b/conf/distro/include/meta-virt-container.inc new file mode 100644 index 00000000..c3ac8394 --- /dev/null +++ b/conf/distro/include/meta-virt-container.inc @@ -0,0 +1,40 @@ +# These variables represent groupings of functionality in the CNCF +# landscape. In particular, they are areas where there is a choice +# between more than one implementation or an area where abstraction +# is beneficial. +# +# The contents of the variables are are runtime components that +# recipes may use for RDEPENDS. +# +# Build dependencies are not typically flexible, so do not currently +# have DEPENDS equivalents for the components (i.e. DEPENDS on runc +# versus crun). +# +# Distro features such as kubernetes or other container stacks +# can be used to set different defaults for these variables. +# +# Note: these are "global" values, since they represent choices. +# If more than of a grouping is required on target, then the variable +# can be appended or set to multiple values. That being said, Recipes +# should generally agree on the values, hence the global namespace. +# Recipe specific choices can still be done, but they risk +# conflicting on target or causing runtime issues / errors. +# + +## CNCF "components" + +# engines: docker-ce/docker-moby, virtual-containerd, cri-o, podman +VIRTUAL-RUNTIME_container_engine ??= "podman" +# runtime: runc, crun, runv, runx +VIRTUAL-RUNTIME_container_runtime ??= "virtual-runc" +# networking: cni, netavark +VIRTUAL-RUNTIME_container_networking ??= "cni" +# dns: cni, aardvark-dns +VIRTUAL-RUNTIME_container_dns ??= "cni" +# orchestration: k8s, k3s +VIRTUAL-RUNTIME_container_orchestration ??= "k3s" + +## Kubernetes terminology "components" + +VIRTUAL-RUNTIME_cri ??= "virtual-containerd" +VIRTUAL-RUNTIME_cni ??= "cni" diff --git a/conf/distro/include/meta-virt-default-versions.inc b/conf/distro/include/meta-virt-default-versions.inc index 27e7b90d..b93f68d3 100644 --- a/conf/distro/include/meta-virt-default-versions.inc +++ b/conf/distro/include/meta-virt-default-versions.inc @@ -1,9 +1,4 @@ # Meta-virtuailization PREFERED_VERSION -PREFERRED_VERSION_python-blinker = "1.3" -PREFERRED_VERSION_python-gevent = "1.0.1" -PREFERRED_VERSION_python-m2crypto = "0.22.3" -PREFERRED_VERSION_python-pyyaml = "3.11" -PREFERRED_VERSION_python-redis = "2.10.3" -PREFERRED_VERSION_python-sqlalchemy = "1.1.5" -PREFERRED_VERSION_python-werkzeug = "0.10.4" +PREFERRED_VERSION_xen ?= "4.18%" +PREFERRED_VERSION_xen-tools ?= "4.18%" diff --git a/conf/distro/include/meta-virt-xen.inc b/conf/distro/include/meta-virt-xen.inc new file mode 100644 index 00000000..5fbb57f8 --- /dev/null +++ b/conf/distro/include/meta-virt-xen.inc @@ -0,0 +1,15 @@ +# Make sure Xen mode is enabled in qemu +PACKAGECONFIG:append:pn-qemu = " xen" + +# For builds for ARM platforms, enable fdt +PACKAGECONFIG:append:pn-qemu:arm = " fdt" +PACKAGECONFIG:append:pn-qemu:aarch64 = " fdt" + +# Xen on Raspberry Pi 4 64-bit support +XEN_RPI4_64_CONFIG_PATH ??= \ + 'dynamic-layers/raspberrypi/conf/distro/include/xen-raspberrypi4-64.inc' +include ${@bb.utils.contains('MACHINE', 'raspberrypi4-64', \ + '${XEN_RPI4_64_CONFIG_PATH}', '', d)} + +# Set serial for working qemuboot console +SERIAL_CONSOLES:qemuarm64 ?= "115200;ttyAMA0" diff --git a/conf/distro/include/virt_security_flags.inc b/conf/distro/include/virt_security_flags.inc index f4c288b8..3644d822 100644 --- a/conf/distro/include/virt_security_flags.inc +++ b/conf/distro/include/virt_security_flags.inc @@ -1,5 +1,5 @@ # Build errors with the pie options enabled -SECURITY_CFLAGS_pn-libvirt = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS:pn-libvirt = "${SECURITY_NO_PIE_CFLAGS}" # This has text relco errors with the pie options enabled -SECURITY_CFLAGS_pn-lxc = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS:pn-lxc = "${SECURITY_NO_PIE_CFLAGS}" |