From 25dfe3d20af563b56588723134c435422354bdcd Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Tue, 31 Mar 2026 14:12:06 +0200 Subject: [PATCH] containers: make trimmed runtimes conflict with standard ones Mark the trimmed runtime variants as conflicting with the standard packages so images cannot include both Podman or LXC flavors at the same time. This avoids ambiguous runtime layouts and configuration ownership when a minimal container-manager image uses the trimmed packages while other images may select the standard runtimes. Signed-off-by: Isaac Hermida --- meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb | 2 ++ .../recipes-containers/podman/podman-trimmed_git.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb b/meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb index 8843f5d7a..f4d8aa587 100644 --- a/meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb +++ b/meta-digi-containers/recipes-containers/lxc/lxc-trimmed_git.bb @@ -19,6 +19,8 @@ RDEPENDS:${PN}:remove = " \ PACKAGECONFIG:remove = "templates systemd selinux" +RCONFLICTS:${PN}:append = " lxc" + SYSTEMD_PACKAGES = "" SYSTEMD_SERVICE:${PN} = "" SYSTEMD_SERVICE:${PN}-networking = "" diff --git a/meta-digi-containers/recipes-containers/podman/podman-trimmed_git.bb b/meta-digi-containers/recipes-containers/podman/podman-trimmed_git.bb index b82b8e63d..55a730713 100644 --- a/meta-digi-containers/recipes-containers/podman/podman-trimmed_git.bb +++ b/meta-digi-containers/recipes-containers/podman/podman-trimmed_git.bb @@ -23,6 +23,8 @@ RDEPENDS:${PN}:remove = " \ PACKAGECONFIG:remove = "rootless docker" +RCONFLICTS:${PN}:append = " podman" + do_install:append() { rm -f ${D}${bindir}/docker rm -f ${D}${bindir}/docker-runc