On Tue, Feb 27, 2024 at 12:12 AM Chen Qi via lists.yoctoproject.org
wrote:
>
> From: Chen Qi
>
> We had two containerd recipes, containerd-opencontainers and
> containerd-docker. But now we have only one containerd recipe.
> We should just use the name 'containerd'.
>
> The previous CVE_PRODUCT setting in containerd-opencontainers
> is deleted, as it's no longer needed.
>
> The 'containerd-opencontainers' is added in PROVIDES and RPROVIDES
> for backward compatibility.
As previously mentioned, I'm going to keep this as-is for now.
Cheers,
Bruce
>
> Signed-off-by: Chen Qi
> ---
> conf/layer.conf | 2 +-
> ...kefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch | 0
> .../0001-build-don-t-use-gcflags-to-define-trimpath.patch | 0
> .../{containerd-opencontainers_git.bb => containerd_git.bb} | 6 ++
> 4 files changed, 3 insertions(+), 5 deletions(-)
> rename recipes-containers/containerd/{containerd-opencontainers =>
> containerd}/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
> (100%)
> rename recipes-containers/containerd/{containerd-opencontainers =>
> containerd}/0001-build-don-t-use-gcflags-to-define-trimpath.patch (100%)
> rename recipes-containers/containerd/{containerd-opencontainers_git.bb =>
> containerd_git.bb} (96%)
>
> diff --git a/conf/layer.conf b/conf/layer.conf
> index c44d585c..fa9468f3 100644
> --- a/conf/layer.conf
> +++ b/conf/layer.conf
> @@ -40,7 +40,7 @@ LAYERRECOMMENDS_virtualization-layer = " \
> require conf/distro/include/virt_security_flags.inc
>
> PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
> -PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
> +PREFERRED_PROVIDER_virtual/containerd ?= "containerd"
> PREFERRED_PROVIDER_virtual/docker ?= "docker-moby"
>
> # Sanity check for meta-virtualization layer.
> diff --git
> a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
>
> b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
> similarity index 100%
> rename from
> recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
> rename to
> recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
> diff --git
> a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch
>
> b/recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
> similarity index 100%
> rename from
> recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch
> rename to
> recipes-containers/containerd/containerd/0001-build-don-t-use-gcflags-to-define-trimpath.patch
> diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb
> b/recipes-containers/containerd/containerd_git.bb
> similarity index 96%
> rename from recipes-containers/containerd/containerd-opencontainers_git.bb
> rename to recipes-containers/containerd/containerd_git.bb
> index 1dadf287..ac874397 100644
> --- a/recipes-containers/containerd/containerd-opencontainers_git.bb
> +++ b/recipes-containers/containerd/containerd_git.bb
> @@ -20,8 +20,8 @@ CVE_VERSION = "v2.0.0-beta.0"
>
> # EXTRA_OEMAKE += "GODEBUG=1"
>
> -PROVIDES += "virtual/containerd"
> -RPROVIDES:${PN} = "virtual-containerd"
> +PROVIDES += "virtual/containerd containerd-opencontainers"
> +RPROVIDES:${PN} = "virtual-containerd containerd-opencontainers"
>
> S = "${WORKDIR}/git/src/github.com/containerd/containerd"
>
> @@ -96,5 +96,3 @@ INSANE_SKIP:${PN} += "ldflags already-stripped"
> COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
>
> RDEPENDS:${PN} += " ${VIRTUAL-RUNTIME_container_runtime}"
> -
> -CVE_PRODUCT = "containerd"
> --
> 2.42.0
>
>
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8588):
https://lists.yoctoproject.org/g/meta-virtualization/message/8588
Mute This Topic: https://lists.yoctoproject.org/mt/104598179/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
