From: Qi.Chen@windriver.com
To: meta-virtualization@lists.yoctoproject.org
Subject: [meta-virtualization][PATCH 4/4] meta-virt: rename containerd-opencontainers to containerd
Date: Mon, 26 Feb 2024 21:12:11 -0800 [thread overview]
Message-ID: <20240227051211.3390256-4-Qi.Chen@windriver.com> (raw)
In-Reply-To: <20240227051211.3390256-1-Qi.Chen@windriver.com>
From: Chen Qi <Qi.Chen@windriver.com>
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.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
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
next prev parent reply other threads:[~2024-02-27 5:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 5:12 [meta-virtualization][PATCH 1/4] oci-image-tools: remove unneeded deps Qi.Chen
2024-02-27 5:12 ` [meta-virtualization][PATCH 2/4] crun: " Qi.Chen
2024-02-27 13:58 ` Bruce Ashfield
2024-02-27 5:12 ` [meta-virtualization][PATCH 3/4] meta-virt: remove pure go source packages Qi.Chen
2024-02-27 13:48 ` Bruce Ashfield
2024-02-28 2:23 ` ChenQi
2024-02-27 5:12 ` Qi.Chen [this message]
2024-02-27 13:45 ` [meta-virtualization][PATCH 4/4] meta-virt: rename containerd-opencontainers to containerd Bruce Ashfield
2024-02-27 13:56 ` [meta-virtualization][PATCH 1/4] oci-image-tools: remove unneeded deps Bruce Ashfield
2024-02-28 2:50 ` ChenQi
2024-02-28 3:27 ` Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240227051211.3390256-4-Qi.Chen@windriver.com \
--to=qi.chen@windriver.com \
--cc=meta-virtualization@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).