From: "Chen, Qi" <Qi.Chen@windriver.com>
To: Bruce Ashfield <bruce.ashfield@gmail.com>
Cc: "meta-virtualization@lists.yoctoproject.org"
<meta-virtualization@lists.yoctoproject.org>
Subject: RE: [meta-virtualization][PATCH 2/2] meta-virt: rename containerd-opencontainers to containerd
Date: Tue, 27 Jun 2023 02:55:01 +0000 [thread overview]
Message-ID: <CO6PR11MB5602CB97E85B2463294E82FBED27A@CO6PR11MB5602.namprd11.prod.outlook.com> (raw)
In-Reply-To: <CADkTA4OseSk3cukcf4eOePhRHHqjLBNOk9x-Ap0-nby0a5-EgQ@mail.gmail.com>
Got it. Thanks.
Regards,
Qi
-----Original Message-----
From: Bruce Ashfield <bruce.ashfield@gmail.com>
Sent: Monday, June 26, 2023 7:58 PM
To: bruce.ashfield@gmail.com
Cc: Chen, Qi <Qi.Chen@windriver.com>; meta-virtualization@lists.yoctoproject.org
Subject: Re: [meta-virtualization][PATCH 2/2] meta-virt: rename containerd-opencontainers to containerd
On Mon, Jun 26, 2023 at 3:12 AM Bruce Ashfield via lists.yoctoproject.org <bruce.ashfield=gmail.com@lists.yoctoproject.org> wrote:
>
> On Mon, Jun 26, 2023 at 2:44 AM Chen Qi via lists.yoctoproject.org
> <Qi.Chen=windriver.com@lists.yoctoproject.org> wrote:
> >
> > 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'.
>
> We could, but there's also no pressing need to change it (otherwise, I
> would have).
>
> I'll leave this as-is, since there are actually some layers with
> includes that I don't feel the need to break at the moment.
>
I should clarify that this is something I'll monitor and queue for the next release, once I've confirmed that migration has been done.
Bruce
> Bruce
>
> >
> > 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-spec
> > i.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
> > 9ff61f1..cbd75f5 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-Makef
> > ile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
> > b/recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BU
> > ILD_FLAGS-to-be-externally-speci.patch
> > similarity index 100%
> > rename from
> > recipes-containers/containerd/containerd-opencontainers/0001-Makefil
> > e-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
> > rename to
> > recipes-containers/containerd/containerd/0001-Makefile-allow-GO_BUIL
> > D_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-gcfl
> > ags-to-define-trimpath.patch
> > similarity index 100%
> > rename from
> > recipes-containers/containerd/containerd-opencontainers/0001-build-d
> > on-t-use-gcflags-to-define-trimpath.patch
> > rename to
> > recipes-containers/containerd/containerd/0001-build-don-t-use-gcflag
> > s-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 c804caa..ab41a6c 100644
> > --- a/recipes-containers/containerd/containerd-opencontainers_git.bb
> > +++ b/recipes-containers/containerd/containerd_git.bb
> > @@ -20,8 +20,8 @@ CVE_VERSION = "v1.7.1"
> >
> > # 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"
> >
> > @@ -99,5 +99,3 @@ INSANE_SKIP:${PN} += "ldflags already-stripped"
> > COMPATIBLE_HOST = "^(?!(qemu)?mips).*"
> >
> > RDEPENDS:${BPN} += " ${VIRTUAL-RUNTIME_container_runtime}"
> > -
> > -CVE_PRODUCT = "containerd"
> > --
> > 2.34.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
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8107):
> https://lists.yoctoproject.org/g/meta-virtualization/message/8107
> Mute This Topic: https://lists.yoctoproject.org/mt/99782881/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe:
> https://lists.yoctoproject.org/g/meta-virtualization/leave/6693017/105
> 0810/978058475/xyzzy [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
prev parent reply other threads:[~2023-06-27 2:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-26 6:44 [meta-virtualization][PATCH 1/2] containerd: fix HOMEPAGE Qi.Chen
2023-06-26 6:44 ` [meta-virtualization][PATCH 2/2] meta-virt: rename containerd-opencontainers to containerd Qi.Chen
2023-06-26 7:12 ` Bruce Ashfield
[not found] ` <176C2405FDA29323.6977@lists.yoctoproject.org>
2023-06-26 11:57 ` Bruce Ashfield
2023-06-27 2:55 ` Chen, Qi [this message]
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=CO6PR11MB5602CB97E85B2463294E82FBED27A@CO6PR11MB5602.namprd11.prod.outlook.com \
--to=qi.chen@windriver.com \
--cc=bruce.ashfield@gmail.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).