[meta-virtualization][PATCH v2 2/2] podman: require catatonit
From: Patrick Wicki
Alternatively, we could add it to RRECOMMENDS. But I would say, given
its name, managing pods is part of podman's core functionality and that
requires catatonit, which is currently only pulled in for the ptest:
root@qemux86-64:~# podman pod create
Error: building local pause image: finding pause binary: exec: "catatonit":
executable file not found in $PATH
Signed-off-by: Patrick Wicki
---
recipes-containers/podman/podman_git.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/recipes-containers/podman/podman_git.bb
b/recipes-containers/podman/podman_git.bb
index 07c17449..cba685c0 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -150,7 +150,7 @@ VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter"
COMPATIBLE_HOST = "^(?!mips).*"
RDEPENDS:${PN} += "\
- conmon ${VIRTUAL-RUNTIME_container_runtime} iptables libdevmapper
${VIRTUAL-RUNTIME_container_networking} ${VIRTUAL-RUNTIME_base-utils-nsenter} \
+ catatonit conmon ${VIRTUAL-RUNTIME_container_runtime} iptables
libdevmapper ${VIRTUAL-RUNTIME_container_networking}
${VIRTUAL-RUNTIME_base-utils-nsenter} \
${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs
slirp4netns', '', d)} \
"
RRECOMMENDS:${PN} += "slirp4netns \
@@ -167,7 +167,6 @@ RDEPENDS:${PN}-ptest += " \
bash \
bats \
buildah \
- catatonit \
coreutils \
file \
gnupg \
--
2.45.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8717):
https://lists.yoctoproject.org/g/meta-virtualization/message/8717
Mute This Topic: https://lists.yoctoproject.org/mt/105935940/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[meta-virtualization][PATCH v2 1/2] podman: remove skopeo rdepends
From: Patrick Wicki
Podman does not require skopeo to run. They are both independent tools.
In distros like Debian, Fedora and Arch they don't depend on it either.
Skopeo also seems to be used in some of podman's tests, so it makes
sense to keep it around for the ptest.
We do require skopeo's libdevmapper dependency, so include that
directly. And inherit container-host to make sure the container configs
are present on the device.
Signed-off-by: Patrick Wicki
---
recipes-containers/podman/podman_git.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/recipes-containers/podman/podman_git.bb
b/recipes-containers/podman/podman_git.bb
index 32de3f0c..07c17449 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -55,6 +55,7 @@ TOOLCHAIN = "gcc"
export BUILDFLAGS="${GOBUILDFLAGS}"
inherit go goarch
+inherit container-host
inherit systemd pkgconfig ptest
do_configure[noexec] = "1"
@@ -149,7 +150,7 @@ VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter"
COMPATIBLE_HOST = "^(?!mips).*"
RDEPENDS:${PN} += "\
- conmon ${VIRTUAL-RUNTIME_container_runtime} iptables
${VIRTUAL-RUNTIME_container_networking} skopeo
${VIRTUAL-RUNTIME_base-utils-nsenter} \
+ conmon ${VIRTUAL-RUNTIME_container_runtime} iptables libdevmapper
${VIRTUAL-RUNTIME_container_networking} ${VIRTUAL-RUNTIME_base-utils-nsenter} \
${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs
slirp4netns', '', d)} \
"
RRECOMMENDS:${PN} += "slirp4netns \
@@ -172,5 +173,6 @@ RDEPENDS:${PN}-ptest += " \
gnupg \
jq \
make \
+ skopeo \
tar \
"
--
2.45.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8716):
https://lists.yoctoproject.org/g/meta-virtualization/message/8716
Mute This Topic: https://lists.yoctoproject.org/mt/105935939/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
