[meta-virtualization][PATCH 1/2] podman: remove skopeo rdepends

[meta-virtualization][PATCH 1/2] podman: remove skopeo rdepends

[patrick.wicki]

From: Patrick Wicki <patrick.wicki@siemens.com>

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.

We do require some of its dependencies, so include those directly.
Skopeo also seems to be used in some of podman's tests, so it makes
sense to keep it around for the ptest.

Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com>
---
 recipes-containers/podman/podman_git.bb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index f69dec16..41f090f0 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"
@@ -148,8 +149,13 @@ 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} \
+RDEPENDS:${PN} += " \
+	conmon \
+	iptables \
+	libdevmapper \
+	${VIRTUAL-RUNTIME_base-utils-nsenter} \
+	${VIRTUAL-RUNTIME_container_networking} \
+	${VIRTUAL-RUNTIME_container_runtime} \
 	${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs slirp4netns', '', d)} \
 "
 RRECOMMENDS:${PN} += "slirp4netns \
@@ -172,5 +178,6 @@ RDEPENDS:${PN}-ptest += " \
 	gnupg \
 	jq \
 	make \
+	skopeo \
 	tar \
 "
-- 
2.44.0

[meta-virtualization][PATCH 2/2] podman: require catatonit

[patrick.wicki]

From: Patrick Wicki <patrick.wicki@siemens.com>

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 <patrick.wicki@siemens.com>
---
 recipes-containers/podman/podman_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 41f090f0..7bdefba5 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -150,6 +150,7 @@ VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter"
 COMPATIBLE_HOST = "^(?!mips).*"
 
 RDEPENDS:${PN} += " \
+	catatonit \
 	conmon \
 	iptables \
 	libdevmapper \
@@ -172,7 +173,6 @@ RDEPENDS:${PN}-ptest += " \
 	bash \
 	bats \
 	buildah \
-	catatonit \
 	coreutils \
 	file \
 	gnupg \
-- 
2.44.0

Re: [meta-virtualization][PATCH 1/2] podman: remove skopeo rdepends

[Bruce Ashfield]

Hi Patrick,

In message: [meta-virtualization][PATCH 1/2] podman: remove skopeo rdepends
on 29/04/2024 Patrick Wicki via lists.yoctoproject.org wrote:

> From: Patrick Wicki <patrick.wicki@siemens.com>
> 
> 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.
> 
> We do require some of its dependencies, so include those directly.
> Skopeo also seems to be used in some of podman's tests, so it makes
> sense to keep it around for the ptest.
> 
> Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com>
> ---
>  recipes-containers/podman/podman_git.bb | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
> index f69dec16..41f090f0 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

The addition of container-host configuration should be mentioned
in the commit log.

>  inherit systemd pkgconfig ptest
>  
>  do_configure[noexec] = "1"
> @@ -148,8 +149,13 @@ 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} \
> +RDEPENDS:${PN} += " \
> +	conmon \
> +	iptables \
> +	libdevmapper \
> +	${VIRTUAL-RUNTIME_base-utils-nsenter} \
> +	${VIRTUAL-RUNTIME_container_networking} \
> +	${VIRTUAL-RUNTIME_container_runtime} \
>  	${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'fuse-overlayfs slirp4netns', '', d)} \

Many people know that I don't like mixing formatting and functional
changes. So in a v2, keep the formatting as is and make the change
without sorting or changing the list of rdepends.

Other than that, I agree with the logic of the change and thanks
for the patch!

Bruce

>  "
>  RRECOMMENDS:${PN} += "slirp4netns \
> @@ -172,5 +178,6 @@ RDEPENDS:${PN}-ptest += " \
>  	gnupg \
>  	jq \
>  	make \
> +	skopeo \
>  	tar \
>  "
> -- 
> 2.44.0
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8704): https://lists.yoctoproject.org/g/meta-virtualization/message/8704
> Mute This Topic: https://lists.yoctoproject.org/mt/105805579/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

Re: [meta-virtualization][PATCH 2/2] podman: require catatonit

[Bruce Ashfield]

In message: [meta-virtualization][PATCH 2/2] podman: require catatonit
on 29/04/2024 Patrick Wicki via lists.yoctoproject.org wrote:

> From: Patrick Wicki <patrick.wicki@siemens.com>
> 
> 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

We've never required this before since podman create isn't
a common use case for our target devices.

The change is fine with me, but I'll wait for it to be resent
along with v2 of patch 1/2 as the list dependency formatting
will be different.

Bruce

> 
> Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com>
> ---
>  recipes-containers/podman/podman_git.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
> index 41f090f0..7bdefba5 100644
> --- a/recipes-containers/podman/podman_git.bb
> +++ b/recipes-containers/podman/podman_git.bb
> @@ -150,6 +150,7 @@ VIRTUAL-RUNTIME_base-utils-nsenter ?= "util-linux-nsenter"
>  COMPATIBLE_HOST = "^(?!mips).*"
>  
>  RDEPENDS:${PN} += " \
> +	catatonit \
>  	conmon \
>  	iptables \
>  	libdevmapper \
> @@ -172,7 +173,6 @@ RDEPENDS:${PN}-ptest += " \
>  	bash \
>  	bats \
>  	buildah \
> -	catatonit \
>  	coreutils \
>  	file \
>  	gnupg \
> -- 
> 2.44.0
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8705): https://lists.yoctoproject.org/g/meta-virtualization/message/8705
> Mute This Topic: https://lists.yoctoproject.org/mt/105805580/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>