mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
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>
This commit is contained in:
parent
4cea448064
commit
992253f871
|
@ -55,6 +55,7 @@ TOOLCHAIN = "gcc"
|
||||||
export BUILDFLAGS="${GOBUILDFLAGS}"
|
export BUILDFLAGS="${GOBUILDFLAGS}"
|
||||||
|
|
||||||
inherit go goarch
|
inherit go goarch
|
||||||
|
inherit container-host
|
||||||
inherit systemd pkgconfig ptest
|
inherit systemd pkgconfig ptest
|
||||||
|
|
||||||
do_configure[noexec] = "1"
|
do_configure[noexec] = "1"
|
||||||
|
@ -149,7 +150,7 @@ VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter"
|
||||||
COMPATIBLE_HOST = "^(?!mips).*"
|
COMPATIBLE_HOST = "^(?!mips).*"
|
||||||
|
|
||||||
RDEPENDS:${PN} += "\
|
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)} \
|
${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs slirp4netns', '', d)} \
|
||||||
"
|
"
|
||||||
RRECOMMENDS:${PN} += "slirp4netns \
|
RRECOMMENDS:${PN} += "slirp4netns \
|
||||||
|
@ -172,5 +173,6 @@ RDEPENDS:${PN}-ptest += " \
|
||||||
gnupg \
|
gnupg \
|
||||||
jq \
|
jq \
|
||||||
make \
|
make \
|
||||||
|
skopeo \
|
||||||
tar \
|
tar \
|
||||||
"
|
"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user