1 files changed, 20 insertions, 5 deletions

diff --git a/conf/distro/vruntime.conf b/conf/distro/vruntime.conf
index 72958b7d..0ea43e62 100644
--- a/conf/distro/vruntime.conf
+++ b/conf/distro/vruntime.conf
@@ -37,12 +37,13 @@ DISTRO_VERSION = "1.0"
 # Explicitly NOT included: x11, wayland, pulseaudio, bluetooth, wifi, nfc, 3g, pcmcia
 DISTRO_FEATURES = "acl ext2 ipv4 ipv6 seccomp vfat pci vcontainer vxn"
 
-# Block backfill features not needed by container runtime environments.
-# OE-core's DISTRO_FEATURES_BACKFILL auto-appends these to DISTRO_FEATURES
-# unless explicitly listed here. Without this, gobject-introspection-data
-# enables python3-pygobject (which DEPENDS on cairo), and wayland enables
+# Opt out of default distro features not needed by container runtime
+# environments. Without this, gobject-introspection-data enables
+# python3-pygobject (which DEPENDS on cairo), and wayland enables
 # pygobject's cairo PACKAGECONFIG — both are masked in vruntime builds.
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio gobject-introspection-data opengl ptest multiarch wayland vulkan"
+# Note: OE-core replaced DISTRO_FEATURES_BACKFILL_CONSIDERED with
+# DISTRO_FEATURES_OPTED_OUT (commit 159148f4de2).
+DISTRO_FEATURES_OPTED_OUT = "pulseaudio gobject-introspection-data opengl ptest multiarch wayland vulkan"
 
 # Native and nativesdk classes need full features for build tools
 DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}"
@@ -62,6 +63,11 @@ VIRTUAL-RUNTIME_login_manager = ""
 # Keep images small - no documentation or debug
 EXTRA_IMAGE_FEATURES = ""
 
+# Disable ptest for glib-2.0 — its -ptest RDEPENDS pulls
+# cairo → fontconfig → freetype (entire graphics stack) via
+# python3-dbusmock → python3-pygobject, all masked in vruntime.
+PTEST_ENABLED:pn-glib-2.0 = ""
+
 # =============================================================================
 # Container runtime: NOT SET
 # =============================================================================
@@ -74,3 +80,12 @@ EXTRA_IMAGE_FEATURES = ""
 # their required runtimes in IMAGE_INSTALL.
 # =============================================================================
 VIRTUAL-RUNTIME_container_runtime = ""
+VIRTUAL-RUNTIME_container_engine = ""
+VIRTUAL-RUNTIME_container_networking = ""
+VIRTUAL-RUNTIME_container_dns = ""
+VIRTUAL-RUNTIME_container_orchestration = ""
+
+# Ensure the unified runc recipe is the provider — vdkr-rootfs-image
+# RDEPENDS on runc directly. Strong assignment to override any stale
+# cache or weak defaults.
+PREFERRED_PROVIDER_virtual/runc = "runc"