Got it. Thanks. Regards, Qi
-----Original Message----- From: Bruce Ashfield <[email protected]> Sent: Monday, June 26, 2023 7:58 PM To: [email protected] Cc: Chen, Qi <[email protected]>; [email protected] 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 <[email protected]> wrote: > > On Mon, Jun 26, 2023 at 2:44 AM Chen Qi via lists.yoctoproject.org > <[email protected]> wrote: > > > > From: Chen Qi <[email protected]> > > > > 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 <[email protected]> > > --- > > 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 > > > -- - 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 (#8112): https://lists.yoctoproject.org/g/meta-virtualization/message/8112 Mute This Topic: https://lists.yoctoproject.org/mt/99782881/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
