[PATCH v2 1/2] busybox: Add nsenter for podman runtime

[PATCH v2 1/2] busybox: Add nsenter for podman runtime

[Nathan Dunne]

From: Nathan Dunne <Nathan.Dunne@arm.com>

Add nsenter to Busybox configuration as it is required by Podman at runtime

Issue-Id: SCM-2355
Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
Change-Id: Icee4da01294c4e7ff91ab528b2df01cb486b2df1
---
 recipes-core/busybox/busybox/nsenter.cfg        | 1 +
 recipes-core/busybox/busybox_virtualization.inc | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 recipes-core/busybox/busybox/nsenter.cfg

diff --git a/recipes-core/busybox/busybox/nsenter.cfg b/recipes-core/busybox/busybox/nsenter.cfg
new file mode 100644
index 0000000..0a58df5
--- /dev/null
+++ b/recipes-core/busybox/busybox/nsenter.cfg
@@ -0,0 +1 @@
+CONFIG_NSENTER=y
diff --git a/recipes-core/busybox/busybox_virtualization.inc b/recipes-core/busybox/busybox_virtualization.inc
index d9c4e67..15f1930 100644
--- a/recipes-core/busybox/busybox_virtualization.inc
+++ b/recipes-core/busybox/busybox_virtualization.inc
@@ -7,4 +7,5 @@ SRC_URI += " \
 	    file://mount-cifs.cfg \
 	    file://ps-extras.cfg \
 	    file://getopt.cfg \
+	    file://nsenter.cfg \
            "
--
2.17.1

[PATCH v2 2/2] podman: Added kernel modules for iptables error

[Nathan Dunne]

From: Nathan Dunne <Nathan.Dunne@arm.com>

Added kernel modules kernel-module-xt-masquerade and
kernel-module-xt-comment to RRECOMMENDS, to avoid iptables
errors with podman

Issue-Id: SCM-2355
Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
Change-Id: If806a6802352b2658a695bf5265c1ead82fe3248
---
 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 62ae024..6fb803e 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -109,5 +109,5 @@ FILES_${PN} += " \
 SYSTEMD_SERVICE_${PN} = "podman.service podman.socket"

 RDEPENDS_${PN} += "conmon virtual/runc iptables cni skopeo"
-RRECOMMENDS_${PN} += "slirp4netns"
+RRECOMMENDS_${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment"
 RCONFLICTS_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
--
2.17.1

Re: [PATCH v2 1/2] busybox: Add nsenter for podman runtime

[Nathan Dunne]

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

Hi,

I've accidentally included the Issue-Id and Change-Id tags in v2 of these patches, can they be removed on merge or should I submit a v3?

Thanks,
Nathan

[-- Attachment #2: Type: text/html, Size: 184 bytes --]

Re: [meta-virtualization] [PATCH v2 2/2] podman: Added kernel modules for iptables error

[Bruce Ashfield]

What's the delta in v2 from v1 ? It wasn't immediately obvious to me.

Bruce

On Thu, Apr 15, 2021 at 4:37 AM Nathan Dunne <Nathan.Dunne@arm.com> wrote:
>
> From: Nathan Dunne <Nathan.Dunne@arm.com>
>
> Added kernel modules kernel-module-xt-masquerade and
> kernel-module-xt-comment to RRECOMMENDS, to avoid iptables
> errors with podman
>
> Issue-Id: SCM-2355
> Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
> Change-Id: If806a6802352b2658a695bf5265c1ead82fe3248
> ---
>  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 62ae024..6fb803e 100644
> --- a/recipes-containers/podman/podman_git.bb
> +++ b/recipes-containers/podman/podman_git.bb
> @@ -109,5 +109,5 @@ FILES_${PN} += " \
>  SYSTEMD_SERVICE_${PN} = "podman.service podman.socket"
>
>  RDEPENDS_${PN} += "conmon virtual/runc iptables cni skopeo"
> -RRECOMMENDS_${PN} += "slirp4netns"
> +RRECOMMENDS_${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment"
>  RCONFLICTS_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
> --
> 2.17.1
>
>
> 
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [PATCH v2 2/2] podman: Added kernel modules for iptables error

[Nathan Dunne]

[-- Attachment #1: Type: text/plain, Size: 92 bytes --]

Just the commit message on the first patch in the chain as suggested by Bertrand

Nathan

[-- Attachment #2: Type: text/html, Size: 100 bytes --]

Re: [meta-virtualization] [PATCH v2 2/2] podman: Added kernel modules for iptables error

[Bertrand Marquis]

Hi Bruce,

> On 15 Apr 2021, at 13:38, Bruce Ashfield via lists.yoctoproject.org <bruce.ashfield=gmail.com@lists.yoctoproject.org> wrote:
> 
> What's the delta in v2 from v1 ? It wasn't immediately obvious to me.

Nathan added a commit message to the first patch.

Cheers
Bertrand

> 
> Bruce
> 
> On Thu, Apr 15, 2021 at 4:37 AM Nathan Dunne <Nathan.Dunne@arm.com> wrote:
>> 
>> From: Nathan Dunne <Nathan.Dunne@arm.com>
>> 
>> Added kernel modules kernel-module-xt-masquerade and
>> kernel-module-xt-comment to RRECOMMENDS, to avoid iptables
>> errors with podman
>> 
>> Issue-Id: SCM-2355
>> Signed-off-by: Nathan Dunne <Nathan.Dunne@arm.com>
>> Change-Id: If806a6802352b2658a695bf5265c1ead82fe3248
>> ---
>> 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 62ae024..6fb803e 100644
>> --- a/recipes-containers/podman/podman_git.bb
>> +++ b/recipes-containers/podman/podman_git.bb
>> @@ -109,5 +109,5 @@ FILES_${PN} += " \
>> SYSTEMD_SERVICE_${PN} = "podman.service podman.socket"
>> 
>> RDEPENDS_${PN} += "conmon virtual/runc iptables cni skopeo"
>> -RRECOMMENDS_${PN} += "slirp4netns"
>> +RRECOMMENDS_${PN} += "slirp4netns kernel-module-xt-masquerade kernel-module-xt-comment"
>> RCONFLICTS_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
>> --
>> 2.17.1
>> 
>> 
>> 
>> 
> 
> 
> -- 
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II
> 
> 

Re: [meta-virtualization] [PATCH v2 1/2] busybox: Add nsenter for podman runtime

[Bruce Ashfield]

In message: Re: [meta-virtualization] [PATCH v2 1/2] busybox: Add nsenter for podman runtime
on 15/04/2021 Nathan Dunne wrote:

> Hi,
> 
> I've accidentally included the Issue-Id and Change-Id tags in v2 of these
> patches, can they be removed on merge or should I submit a v3?

I edited the patches are part of my normal flow and dropped the tracking
IDs.

But thanks for noticing and following up!

Bruce

> 
> Thanks,
> Nathan

> 
> 
> 

Re: [PATCH v2 1/2] busybox: Add nsenter for podman runtime

[Nathan Dunne]

[-- Attachment #1: Type: text/plain, Size: 108 bytes --]

Hi Bruce,

Could these two patches for podman also be backported to Hardknott please?

Thanks,
Nathan

[-- Attachment #2: Type: text/html, Size: 128 bytes --]

Re: [meta-virtualization] [PATCH v2 1/2] busybox: Add nsenter for podman runtime

[Bruce Ashfield]

On Mon, Apr 19, 2021 at 6:04 AM Nathan Dunne <Nathan.Dunne@arm.com> wrote:
>
> Hi Bruce,
>
> Could these two patches for podman also be backported to Hardknott please?
>

they should be there, I cherry picked them last night.

... but now that I go look, I see I didn't push them.

All good now.

Bruce

> Thanks,
> Nathan
> 
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II