summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Wicki <patrick.wicki@siemens.com>2024-05-06 10:28:05 +0200
committerBruce Ashfield <bruce.ashfield@gmail.com>2024-05-13 22:32:38 -0400
commit992253f8714c7bccaade9dc6cda9d2f01c51b763 (patch)
treef93284f1e7da675551bb63ca75aca085b56ab1dc
parent4cea448064d4fa96968b482ecd9ab4585ca1edeb (diff)
downloadmeta-virtualization-992253f8714c7bccaade9dc6cda9d2f01c51b763.tar.gz
podman: remove skopeo rdepends
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 <patrick.wicki@siemens.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/podman/podman_git.bb4
1 files changed, 3 insertions, 1 deletions
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"
55export BUILDFLAGS="${GOBUILDFLAGS}" 55export BUILDFLAGS="${GOBUILDFLAGS}"
56 56
57inherit go goarch 57inherit go goarch
58inherit container-host
58inherit systemd pkgconfig ptest 59inherit systemd pkgconfig ptest
59 60
60do_configure[noexec] = "1" 61do_configure[noexec] = "1"
@@ -149,7 +150,7 @@ VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter"
149COMPATIBLE_HOST = "^(?!mips).*" 150COMPATIBLE_HOST = "^(?!mips).*"
150 151
151RDEPENDS:${PN} += "\ 152RDEPENDS:${PN} += "\
152 conmon ${VIRTUAL-RUNTIME_container_runtime} iptables ${VIRTUAL-RUNTIME_container_networking} skopeo ${VIRTUAL-RUNTIME_base-utils-nsenter} \ 153 conmon ${VIRTUAL-RUNTIME_container_runtime} iptables libdevmapper ${VIRTUAL-RUNTIME_container_networking} ${VIRTUAL-RUNTIME_base-utils-nsenter} \
153 ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs slirp4netns', '', d)} \ 154 ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs slirp4netns', '', d)} \
154" 155"
155RRECOMMENDS:${PN} += "slirp4netns \ 156RRECOMMENDS:${PN} += "slirp4netns \
@@ -172,5 +173,6 @@ RDEPENDS:${PN}-ptest += " \
172 gnupg \ 173 gnupg \
173 jq \ 174 jq \
174 make \ 175 make \
176 skopeo \
175 tar \ 177 tar \
176" 178"