From af973ba6d2830cf608ad4819340942d1d26e5461 Mon Sep 17 00:00:00 2001 From: egg12138 Date: Thu, 20 Nov 2025 11:26:43 +0800 Subject: [PATCH] global-variable: add VIRTUAL-RUNTIME_container_engine - introduced for future development - compatible with recent version of meta-virtualization Signed-off-by: egg12318 --- .oebuild/features/containerd.yaml | 1 + .oebuild/features/isulad.yaml | 1 + meta-openeuler/conf/distro/openeuler.conf | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.oebuild/features/containerd.yaml b/.oebuild/features/containerd.yaml index 6f8bd306d55..25db817dd7f 100644 --- a/.oebuild/features/containerd.yaml +++ b/.oebuild/features/containerd.yaml @@ -7,3 +7,4 @@ layers: local_conf: | DISTRO_FEATURES:append = " virtualization containerd " + VIRTUAL-RUNTIME_container_engine:append = " containerd " diff --git a/.oebuild/features/isulad.yaml b/.oebuild/features/isulad.yaml index 90eb53d58f9..40fc6fdcea8 100644 --- a/.oebuild/features/isulad.yaml +++ b/.oebuild/features/isulad.yaml @@ -4,3 +4,4 @@ support: qemu-aarch64|raspberrypi4-64|hieulerpi1|kp920 local_conf: | DISTRO_FEATURES:append = " isulad " + VIRTUAL-RUNTIME_container_engine:append = " isulad " diff --git a/meta-openeuler/conf/distro/openeuler.conf b/meta-openeuler/conf/distro/openeuler.conf index b35badc684f..7df2e286e75 100644 --- a/meta-openeuler/conf/distro/openeuler.conf +++ b/meta-openeuler/conf/distro/openeuler.conf @@ -25,6 +25,10 @@ VIRTUAL-RUNTIME_dev_manager ?= "${@['systemd', 'busybox-mdev']['${INIT_MANAGER}' OPENEULER_DEFAULT_DISTRO_FEATURES = "pam" # define root home, default /home/root ROOT_HOME ?= "/root" +# list of container engine (like cri-o, wasm-edge, docker, podman, containerd, isulad) +# currently we support "isulad", "containerd" +# usefull for higher version of meta-virtualization +VIRTUAL-RUNTIME_container_engine ?= "" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${OPENEULER_DEFAULT_DISTRO_FEATURES}" @@ -116,9 +120,9 @@ DL_DIR ?= "${OPENEULER_SP_DIR}/downloads" # openEuler repos's path has a higher priority than yocto's path. # For example, file://busybox.conf may exist both yocto's path and openeuler's # repo path. by default, openeuler's busybox.conf will be used not yocto's. -# However this may cause some issues, the unmatch of runtime conf from openeuler +# However this may cause some issues, the unmatch of runtime conf from openeuler # and build configuration from yocto. Taking rsyslog as example, yocto's build -# does not enable imjournal module, but the rsyslog.conf from openeuler assume +# does not enable imjournal module, but the rsyslog.conf from openeuler assume # imjournal module enabled with systemd, this unmatch will cause error of rsyslog. # A better way is to use yocto's rsyslog.conf to match yocto's build. # To fix it, you can do it in ryslog.bbappend, or set yocto's path has a higher priority -- Gitee