* [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
@ 2025-05-28 5:48 changqing.li
2025-06-05 2:29 ` Bruce Ashfield
0 siblings, 1 reply; 6+ messages in thread
From: changqing.li @ 2025-05-28 5:48 UTC (permalink / raw)
To: meta-virtualization
From: Changqing Li <changqing.li@windriver.com>
make cni_networking conditional, when k3s, k8s is enabled, the
networking configuration will be provided by the orchestration package,
containerd-cni is not needed. This is for fix the following error:
PACKAGE_CLASSES = "package_deb"
do_rootfs failed with error:
dpkg: error processing archive /path/to/oe-rootfs-repo/corei7-64/./kubernetes-cni_v1.32.0+git0+5fe148234f_release-r0.deb (--unpack):
trying to overwrite '/etc/cni/net.d/cni-containerd-net.conflist', which is also in package containerd-cni v2.0.5-r0
Refer [1], "--no-force-overwrite" is set for dpkg, so above error
occurred.
[1] https://git.openembedded.org/openembedded-core/commit/?id=cb95ba079960411775c57ab864d266e15a6292d1
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
recipes-containers/containerd/containerd_git.bb | 2 +-
recipes-core/packagegroups/packagegroup-container.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
index c683fbeb..def7591a 100644
--- a/recipes-containers/containerd/containerd_git.bb
+++ b/recipes-containers/containerd/containerd_git.bb
@@ -102,4 +102,4 @@ RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
## This may need to be made conditional on K3S or similar being
## configured in the distro, since we may have collisions.
CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist"
-inherit cni_networking
+inherit_defer ${@bb.utils.contains_any('DISTRO_FEATURES', 'k3s k8s', '', 'cni_networking', d)}
diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
index f5e20344..8cbcf28e 100644
--- a/recipes-core/packagegroups/packagegroup-container.bb
+++ b/recipes-core/packagegroups/packagegroup-container.bb
@@ -69,7 +69,7 @@ RDEPENDS:packagegroup-oci = " \
RDEPENDS:packagegroup-containerd = " \
virtual-containerd \
packagegroup-cni \
- containerd-cni \
+ ${@bb.utils.contains_any('DISTRO_FEATURES','k3s k8s','','containerd-cni',d)} \
nerdctl \
tini \
"
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
2025-05-28 5:48 [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional changqing.li
@ 2025-06-05 2:29 ` Bruce Ashfield
2025-06-11 7:19 ` Changqing Li
0 siblings, 1 reply; 6+ messages in thread
From: Bruce Ashfield @ 2025-06-05 2:29 UTC (permalink / raw)
To: changqing.li; +Cc: meta-virtualization
In message: [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
on 28/05/2025 Changqing Li via lists.yoctoproject.org wrote:
> From: Changqing Li <changqing.li@windriver.com>
>
> make cni_networking conditional, when k3s, k8s is enabled, the
> networking configuration will be provided by the orchestration package,
> containerd-cni is not needed. This is for fix the following error:
> PACKAGE_CLASSES = "package_deb"
> do_rootfs failed with error:
> dpkg: error processing archive /path/to/oe-rootfs-repo/corei7-64/./kubernetes-cni_v1.32.0+git0+5fe148234f_release-r0.deb (--unpack):
> trying to overwrite '/etc/cni/net.d/cni-containerd-net.conflist', which is also in package containerd-cni v2.0.5-r0
We shouldn't need to do this to fix the package install. Whether we need
to do it to make sure networking configurations don't conflict is a separate
question (and one that we need more information to decide on).
The design of the cni_networking is to allow co-existence of packages
that need to configure cni networking. So we don't have to do what
you've tried to do in this patch.
Let's rename the files referenced in CNI_NETWORKING_FILES to something
more specific to the kubernetes packages and then they can both be
installed at the same time.
That's one patch.
If you can show me that the two networking configurations being installed
at the same time cause issues, we can then do the coordination betwen
the packages similarly to what you are doing here in a second, separate
patch.
Bruce
>
> Refer [1], "--no-force-overwrite" is set for dpkg, so above error
> occurred.
>
> [1] https://git.openembedded.org/openembedded-core/commit/?id=cb95ba079960411775c57ab864d266e15a6292d1
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ---
> recipes-containers/containerd/containerd_git.bb | 2 +-
> recipes-core/packagegroups/packagegroup-container.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
> index c683fbeb..def7591a 100644
> --- a/recipes-containers/containerd/containerd_git.bb
> +++ b/recipes-containers/containerd/containerd_git.bb
> @@ -102,4 +102,4 @@ RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
> ## This may need to be made conditional on K3S or similar being
> ## configured in the distro, since we may have collisions.
> CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist"
> -inherit cni_networking
> +inherit_defer ${@bb.utils.contains_any('DISTRO_FEATURES', 'k3s k8s', '', 'cni_networking', d)}
> diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
> index f5e20344..8cbcf28e 100644
> --- a/recipes-core/packagegroups/packagegroup-container.bb
> +++ b/recipes-core/packagegroups/packagegroup-container.bb
> @@ -69,7 +69,7 @@ RDEPENDS:packagegroup-oci = " \
> RDEPENDS:packagegroup-containerd = " \
> virtual-containerd \
> packagegroup-cni \
> - containerd-cni \
> + ${@bb.utils.contains_any('DISTRO_FEATURES','k3s k8s','','containerd-cni',d)} \
> nerdctl \
> tini \
> "
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9261): https://lists.yoctoproject.org/g/meta-virtualization/message/9261
> Mute This Topic: https://lists.yoctoproject.org/mt/113339575/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
[not found] <18439AD6FDF85A0A.10936@lists.yoctoproject.org>
@ 2025-06-09 1:09 ` Changqing Li
2025-06-09 3:44 ` Bruce Ashfield
0 siblings, 1 reply; 6+ messages in thread
From: Changqing Li @ 2025-06-09 1:09 UTC (permalink / raw)
To: meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 2788 bytes --]
Kindly ping
//Changqing
On 5/28/25 13:48, Changqing Li via lists.yoctoproject.org wrote:
> From: Changqing Li<changqing.li@windriver.com>
>
> make cni_networking conditional, when k3s, k8s is enabled, the
> networking configuration will be provided by the orchestration package,
> containerd-cni is not needed. This is for fix the following error:
> PACKAGE_CLASSES = "package_deb"
> do_rootfs failed with error:
> dpkg: error processing archive /path/to/oe-rootfs-repo/corei7-64/./kubernetes-cni_v1.32.0+git0+5fe148234f_release-r0.deb (--unpack):
> trying to overwrite '/etc/cni/net.d/cni-containerd-net.conflist', which is also in package containerd-cni v2.0.5-r0
>
> Refer [1], "--no-force-overwrite" is set for dpkg, so above error
> occurred.
>
> [1]https://git.openembedded.org/openembedded-core/commit/?id=cb95ba079960411775c57ab864d266e15a6292d1
>
> Signed-off-by: Changqing Li<changqing.li@windriver.com>
> ---
> recipes-containers/containerd/containerd_git.bb | 2 +-
> recipes-core/packagegroups/packagegroup-container.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
> index c683fbeb..def7591a 100644
> --- a/recipes-containers/containerd/containerd_git.bb
> +++ b/recipes-containers/containerd/containerd_git.bb
> @@ -102,4 +102,4 @@ RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
> ## This may need to be made conditional on K3S or similar being
> ## configured in the distro, since we may have collisions.
> CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist"
> -inherit cni_networking
> +inherit_defer ${@bb.utils.contains_any('DISTRO_FEATURES', 'k3s k8s', '', 'cni_networking', d)}
> diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
> index f5e20344..8cbcf28e 100644
> --- a/recipes-core/packagegroups/packagegroup-container.bb
> +++ b/recipes-core/packagegroups/packagegroup-container.bb
> @@ -69,7 +69,7 @@ RDEPENDS:packagegroup-oci = " \
> RDEPENDS:packagegroup-containerd = " \
> virtual-containerd \
> packagegroup-cni \
> - containerd-cni \
> + ${@bb.utils.contains_any('DISTRO_FEATURES','k3s k8s','','containerd-cni',d)} \
> nerdctl \
> tini \
> "
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9261):https://lists.yoctoproject.org/g/meta-virtualization/message/9261
> Mute This Topic:https://lists.yoctoproject.org/mt/113339575/3616873
> Group Owner:meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe:https://lists.yoctoproject.org/g/meta-virtualization/unsub [changqing.li@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
[-- Attachment #2: Type: text/html, Size: 4066 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
2025-06-09 1:09 ` Changqing Li
@ 2025-06-09 3:44 ` Bruce Ashfield
0 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2025-06-09 3:44 UTC (permalink / raw)
To: changqing.li; +Cc: meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 3294 bytes --]
Kindly read my reply to your patch.
I'm not merging this as it currently is.
Bruce
On Sun, Jun 8, 2025 at 9:10 PM Changqing Li via lists.yoctoproject.org <
changqing.li=windriver.com@lists.yoctoproject.org> wrote:
> Kindly ping
>
> //Changqing
> On 5/28/25 13:48, Changqing Li via lists.yoctoproject.org wrote:
>
> From: Changqing Li <changqing.li@windriver.com> <changqing.li@windriver.com>
>
> make cni_networking conditional, when k3s, k8s is enabled, the
> networking configuration will be provided by the orchestration package,
> containerd-cni is not needed. This is for fix the following error:
> PACKAGE_CLASSES = "package_deb"
> do_rootfs failed with error:
> dpkg: error processing archive /path/to/oe-rootfs-repo/corei7-64/./kubernetes-cni_v1.32.0+git0+5fe148234f_release-r0.deb (--unpack):
> trying to overwrite '/etc/cni/net.d/cni-containerd-net.conflist', which is also in package containerd-cni v2.0.5-r0
>
> Refer [1], "--no-force-overwrite" is set for dpkg, so above error
> occurred.
>
> [1] https://git.openembedded.org/openembedded-core/commit/?id=cb95ba079960411775c57ab864d266e15a6292d1
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com> <changqing.li@windriver.com>
> ---
> recipes-containers/containerd/containerd_git.bb | 2 +-
> recipes-core/packagegroups/packagegroup-container.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
> index c683fbeb..def7591a 100644
> --- a/recipes-containers/containerd/containerd_git.bb
> +++ b/recipes-containers/containerd/containerd_git.bb
> @@ -102,4 +102,4 @@ RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
> ## This may need to be made conditional on K3S or similar being
> ## configured in the distro, since we may have collisions.
> CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist"
> -inherit cni_networking
> +inherit_defer ${@bb.utils.contains_any('DISTRO_FEATURES', 'k3s k8s', '', 'cni_networking', d)}
> diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
> index f5e20344..8cbcf28e 100644
> --- a/recipes-core/packagegroups/packagegroup-container.bb
> +++ b/recipes-core/packagegroups/packagegroup-container.bb
> @@ -69,7 +69,7 @@ RDEPENDS:packagegroup-oci = " \
> RDEPENDS:packagegroup-containerd = " \
> virtual-containerd \
> packagegroup-cni \
> - containerd-cni \
> + ${@bb.utils.contains_any('DISTRO_FEATURES','k3s k8s','','containerd-cni',d)} \
> nerdctl \
> tini \
> "
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9274):
> https://lists.yoctoproject.org/g/meta-virtualization/message/9274
> Mute This Topic: https://lists.yoctoproject.org/mt/113339575/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [
> bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
[-- Attachment #2: Type: text/html, Size: 5732 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
2025-06-05 2:29 ` Bruce Ashfield
@ 2025-06-11 7:19 ` Changqing Li
2025-06-11 12:40 ` Bruce Ashfield
0 siblings, 1 reply; 6+ messages in thread
From: Changqing Li @ 2025-06-11 7:19 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 4653 bytes --]
On 6/5/25 10:29, Bruce Ashfield wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> In message: [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
> on 28/05/2025 Changqing Li via lists.yoctoproject.org wrote:
>
>> From: Changqing Li<changqing.li@windriver.com>
>>
>> make cni_networking conditional, when k3s, k8s is enabled, the
>> networking configuration will be provided by the orchestration package,
>> containerd-cni is not needed. This is for fix the following error:
>> PACKAGE_CLASSES = "package_deb"
>> do_rootfs failed with error:
>> dpkg: error processing archive /path/to/oe-rootfs-repo/corei7-64/./kubernetes-cni_v1.32.0+git0+5fe148234f_release-r0.deb (--unpack):
>> trying to overwrite '/etc/cni/net.d/cni-containerd-net.conflist', which is also in package containerd-cni v2.0.5-r0
> We shouldn't need to do this to fix the package install. Whether we need
> to do it to make sure networking configurations don't conflict is a separate
> question (and one that we need more information to decide on).
>
> The design of the cni_networking is to allow co-existence of packages
> that need to configure cni networking. So we don't have to do what
> you've tried to do in this patch.
>
> Let's rename the files referenced in CNI_NETWORKING_FILES to something
> more specific to the kubernetes packages and then they can both be
> installed at the same time.
>
> That's one patch.
>
> If you can show me that the two networking configurations being installed
> at the same time cause issues, we can then do the coordination betwen
> the packages similarly to what you are doing here in a second, separate
> patch.
>
> Bruce
Hi, Bruce
Sorry, I did not notice this mail before.
According to kubernetes doc:
"If there are multiple CNI configuration files in the directory, the
kubelet uses the configuration file that comes first by name in
lexicographic order."
Now, both containerd-cni and kubernetes-cni use name
cni-containerd-net.conflist.
How about keep containerd-cni use name cni-containerd-net.conflist, and
let kubernetes-cni use 00_cni-containerd-net.conflist, so that
configuration in kubernetes-cni
will be used if both package installed?
Regards
//Changqing
>
>> Refer [1], "--no-force-overwrite" is set for dpkg, so above error
>> occurred.
>>
>> [1]https://git.openembedded.org/openembedded-core/commit/?id=cb95ba079960411775c57ab864d266e15a6292d1
>>
>> Signed-off-by: Changqing Li<changqing.li@windriver.com>
>> ---
>> recipes-containers/containerd/containerd_git.bb | 2 +-
>> recipes-core/packagegroups/packagegroup-container.bb | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
>> index c683fbeb..def7591a 100644
>> --- a/recipes-containers/containerd/containerd_git.bb
>> +++ b/recipes-containers/containerd/containerd_git.bb
>> @@ -102,4 +102,4 @@ RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
>> ## This may need to be made conditional on K3S or similar being
>> ## configured in the distro, since we may have collisions.
>> CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist"
>> -inherit cni_networking
>> +inherit_defer ${@bb.utils.contains_any('DISTRO_FEATURES', 'k3s k8s', '', 'cni_networking', d)}
>> diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
>> index f5e20344..8cbcf28e 100644
>> --- a/recipes-core/packagegroups/packagegroup-container.bb
>> +++ b/recipes-core/packagegroups/packagegroup-container.bb
>> @@ -69,7 +69,7 @@ RDEPENDS:packagegroup-oci = " \
>> RDEPENDS:packagegroup-containerd = " \
>> virtual-containerd \
>> packagegroup-cni \
>> - containerd-cni \
>> + ${@bb.utils.contains_any('DISTRO_FEATURES','k3s k8s','','containerd-cni',d)} \
>> nerdctl \
>> tini \
>> "
>> --
>> 2.34.1
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#9261):https://lists.yoctoproject.org/g/meta-virtualization/message/9261
>> Mute This Topic:https://lists.yoctoproject.org/mt/113339575/1050810
>> Group Owner:meta-virtualization+owner@lists.yoctoproject.org
>> Unsubscribe:https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
[-- Attachment #2: Type: text/html, Size: 6864 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
2025-06-11 7:19 ` Changqing Li
@ 2025-06-11 12:40 ` Bruce Ashfield
0 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2025-06-11 12:40 UTC (permalink / raw)
To: Changqing Li; +Cc: meta-virtualization
[-- Attachment #1: Type: text/plain, Size: 4980 bytes --]
On Wed, Jun 11, 2025 at 3:19 AM Changqing Li <changqing.li@windriver.com>
wrote:
>
> On 6/5/25 10:29, Bruce Ashfield wrote:
>
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> In message: [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional
> on 28/05/2025 Changqing Li via lists.yoctoproject.org wrote:
>
>
> From: Changqing Li <changqing.li@windriver.com> <changqing.li@windriver.com>
>
> make cni_networking conditional, when k3s, k8s is enabled, the
> networking configuration will be provided by the orchestration package,
> containerd-cni is not needed. This is for fix the following error:
> PACKAGE_CLASSES = "package_deb"
> do_rootfs failed with error:
> dpkg: error processing archive /path/to/oe-rootfs-repo/corei7-64/./kubernetes-cni_v1.32.0+git0+5fe148234f_release-r0.deb (--unpack):
> trying to overwrite '/etc/cni/net.d/cni-containerd-net.conflist', which is also in package containerd-cni v2.0.5-r0
>
> We shouldn't need to do this to fix the package install. Whether we need
> to do it to make sure networking configurations don't conflict is a separate
> question (and one that we need more information to decide on).
>
> The design of the cni_networking is to allow co-existence of packages
> that need to configure cni networking. So we don't have to do what
> you've tried to do in this patch.
>
> Let's rename the files referenced in CNI_NETWORKING_FILES to something
> more specific to the kubernetes packages and then they can both be
> installed at the same time.
>
> That's one patch.
>
> If you can show me that the two networking configurations being installed
> at the same time cause issues, we can then do the coordination betwen
> the packages similarly to what you are doing here in a second, separate
> patch.
>
> Bruce
>
> Hi, Bruce
>
> Sorry, I did not notice this mail before.
>
> According to kubernetes doc:
>
> "If there are multiple CNI configuration files in the directory, the
> kubelet uses the configuration file that comes first by name in
> lexicographic order."
>
> Now, both containerd-cni and kubernetes-cni use name
> cni-containerd-net.conflist.
>
> How about keep containerd-cni use name cni-containerd-net.conflist, and
> let kubernetes-cni use 00_cni-containerd-net.conflist, so that
> configuration in kubernetes-cni
>
> will be used if both package installed?
>
>
That would be a fine solution!
Bruce
Regards
>
> //Changqing
>
>
> Refer [1], "--no-force-overwrite" is set for dpkg, so above error
> occurred.
>
> [1] https://git.openembedded.org/openembedded-core/commit/?id=cb95ba079960411775c57ab864d266e15a6292d1
>
> Signed-off-by: Changqing Li <changqing.li@windriver.com> <changqing.li@windriver.com>
> ---
> recipes-containers/containerd/containerd_git.bb | 2 +-
> recipes-core/packagegroups/packagegroup-container.bb | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb
> index c683fbeb..def7591a 100644
> --- a/recipes-containers/containerd/containerd_git.bb
> +++ b/recipes-containers/containerd/containerd_git.bb
> @@ -102,4 +102,4 @@ RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
> ## This may need to be made conditional on K3S or similar being
> ## configured in the distro, since we may have collisions.
> CNI_NETWORKING_FILES ?= "${UNPACKDIR}/cni-containerd-net.conflist"
> -inherit cni_networking
> +inherit_defer ${@bb.utils.contains_any('DISTRO_FEATURES', 'k3s k8s', '', 'cni_networking', d)}
> diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
> index f5e20344..8cbcf28e 100644
> --- a/recipes-core/packagegroups/packagegroup-container.bb
> +++ b/recipes-core/packagegroups/packagegroup-container.bb
> @@ -69,7 +69,7 @@ RDEPENDS:packagegroup-oci = " \
> RDEPENDS:packagegroup-containerd = " \
> virtual-containerd \
> packagegroup-cni \
> - containerd-cni \
> + ${@bb.utils.contains_any('DISTRO_FEATURES','k3s k8s','','containerd-cni',d)} \
> nerdctl \
> tini \
> "
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9261): https://lists.yoctoproject.org/g/meta-virtualization/message/9261
> Mute This Topic: https://lists.yoctoproject.org/mt/113339575/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end
- "Use the force Harry" - Gandalf, Star Trek II
[-- Attachment #2: Type: text/html, Size: 8360 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-06-11 12:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-28 5:48 [meta-virtualization][walnascar][master][PATCH] containerd: make cni_networking conditional changqing.li
2025-06-05 2:29 ` Bruce Ashfield
2025-06-11 7:19 ` Changqing Li
2025-06-11 12:40 ` Bruce Ashfield
[not found] <18439AD6FDF85A0A.10936@lists.yoctoproject.org>
2025-06-09 1:09 ` Changqing Li
2025-06-09 3:44 ` Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.