* [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 @ 2022-07-07 6:29 Chen Qi 2022-07-07 14:57 ` Bruce Ashfield 0 siblings, 1 reply; 4+ messages in thread From: Chen Qi @ 2022-07-07 6:29 UTC (permalink / raw) To: meta-virtualization Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- .../containerd/containerd-opencontainers_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index b0f92b12..c28b1510 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and support as well as checkpoint and restore for cloning and live migration of containers." -SRCREV = "d12516713c315ea9e651eb1df89cf32ff7c8137c" +SRCREV = "10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1" SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \ file://0001-Add-build-option-GODEBUG-1.patch \ file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" -CONTAINERD_VERSION = "v1.6.1" -CVE_VERSION = "1.6.1" +CONTAINERD_VERSION = "v1.6.6" +CVE_VERSION = "1.6.6" EXTRA_OEMAKE += "GODEBUG=1" @@ -56,7 +56,7 @@ do_compile() { metrics filters identifiers labels leases plugin server services \ cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \ cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \ - shutdown schedcore tracing; do + shutdown schedcore tracing kmutex; do if [ -d ${S}/src/import/${c} ]; then ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c} fi -- 2.37.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 2022-07-07 6:29 [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 Chen Qi @ 2022-07-07 14:57 ` Bruce Ashfield 2022-07-20 1:52 ` Chen, Qi 0 siblings, 1 reply; 4+ messages in thread From: Bruce Ashfield @ 2022-07-07 14:57 UTC (permalink / raw) To: Chen Qi; +Cc: meta-virtualization I have a batched set of package updates pending, I've pushed them to master-next, with more to come in the next few days. Once I merge them to master, I'll cherry-pick the equivalent update to this to kirkstone. Bruce In message: [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 on 06/07/2022 Chen Qi wrote: > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > --- > .../containerd/containerd-opencontainers_git.bb | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb > index b0f92b12..c28b1510 100644 > --- a/recipes-containers/containerd/containerd-opencontainers_git.bb > +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb > @@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and > support as well as checkpoint and restore for cloning and live migration of containers." > > > -SRCREV = "d12516713c315ea9e651eb1df89cf32ff7c8137c" > +SRCREV = "10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1" > SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \ > file://0001-Add-build-option-GODEBUG-1.patch \ > file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ > @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht > LICENSE = "Apache-2.0" > LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" > > -CONTAINERD_VERSION = "v1.6.1" > -CVE_VERSION = "1.6.1" > +CONTAINERD_VERSION = "v1.6.6" > +CVE_VERSION = "1.6.6" > > EXTRA_OEMAKE += "GODEBUG=1" > > @@ -56,7 +56,7 @@ do_compile() { > metrics filters identifiers labels leases plugin server services \ > cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \ > cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \ > - shutdown schedcore tracing; do > + shutdown schedcore tracing kmutex; do > if [ -d ${S}/src/import/${c} ]; then > ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c} > fi > -- > 2.37.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#7414): https://lists.yoctoproject.org/g/meta-virtualization/message/7414 > Mute This Topic: https://lists.yoctoproject.org/mt/92223491/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] 4+ messages in thread
* Re: [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 2022-07-07 14:57 ` Bruce Ashfield @ 2022-07-20 1:52 ` Chen, Qi 2022-07-20 15:08 ` Bruce Ashfield 0 siblings, 1 reply; 4+ messages in thread From: Chen, Qi @ 2022-07-20 1:52 UTC (permalink / raw) To: Bruce Ashfield; +Cc: meta-virtualization@lists.yoctoproject.org [-- Attachment #1: Type: text/plain, Size: 3520 bytes --] Hi Bruce, I just checked the commits on master-next. Hope everything is going well. I also found two typos in the staged commits. d73932c runc-docker: update to 1.3.3 f21dd94 runc: update to 1.3.3 The version should be '1.1.3' instead of '1.3.3'. Regards, Qi ________________________________ From: Bruce Ashfield <bruce.ashfield@gmail.com> Sent: Thursday, July 7, 2022 22:57 To: Chen, Qi <Qi.Chen@windriver.com> Cc: meta-virtualization@lists.yoctoproject.org <meta-virtualization@lists.yoctoproject.org> Subject: Re: [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 I have a batched set of package updates pending, I've pushed them to master-next, with more to come in the next few days. Once I merge them to master, I'll cherry-pick the equivalent update to this to kirkstone. Bruce In message: [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 on 06/07/2022 Chen Qi wrote: > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > --- > .../containerd/containerd-opencontainers_git.bb | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb > index b0f92b12..c28b1510 100644 > --- a/recipes-containers/containerd/containerd-opencontainers_git.bb > +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb > @@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and > support as well as checkpoint and restore for cloning and live migration of containers." > > > -SRCREV = "d12516713c315ea9e651eb1df89cf32ff7c8137c" > +SRCREV = "10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1" > SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \ > file://0001-Add-build-option-GODEBUG-1.patch \ > file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ > @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht > LICENSE = "Apache-2.0" > LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" > > -CONTAINERD_VERSION = "v1.6.1" > -CVE_VERSION = "1.6.1" > +CONTAINERD_VERSION = "v1.6.6" > +CVE_VERSION = "1.6.6" > > EXTRA_OEMAKE += "GODEBUG=1" > > @@ -56,7 +56,7 @@ do_compile() { > metrics filters identifiers labels leases plugin server services \ > cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \ > cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \ > - shutdown schedcore tracing; do > + shutdown schedcore tracing kmutex; do > if [ -d ${S}/src/import/${c} ]; then > ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c} > fi > -- > 2.37.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#7414): https://lists.yoctoproject.org/g/meta-virtualization/message/7414 > Mute This Topic: https://lists.yoctoproject.org/mt/92223491/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: 7574 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 2022-07-20 1:52 ` Chen, Qi @ 2022-07-20 15:08 ` Bruce Ashfield 0 siblings, 0 replies; 4+ messages in thread From: Bruce Ashfield @ 2022-07-20 15:08 UTC (permalink / raw) To: Chen, Qi; +Cc: meta-virtualization@lists.yoctoproject.org On Tue, Jul 19, 2022 at 9:52 PM Chen, Qi <Qi.Chen@windriver.com> wrote: > > Hi Bruce, > > I just checked the commits on master-next. Hope everything is going well. > I also found two typos in the staged commits. > > d73932c runc-docker: update to 1.3.3 > f21dd94 runc: update to 1.3.3 > > The version should be '1.1.3' instead of '1.3.3'. My scripts appear to have gotten the upgrade wrong, i fixed them manually. As for the other upgrades, they are still under test as I'm having some system level integration issues. But hopefully that is resolved soon. Bruce > > Regards, > Qi > ________________________________ > From: Bruce Ashfield <bruce.ashfield@gmail.com> > Sent: Thursday, July 7, 2022 22:57 > To: Chen, Qi <Qi.Chen@windriver.com> > Cc: meta-virtualization@lists.yoctoproject.org <meta-virtualization@lists.yoctoproject.org> > Subject: Re: [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 > > I have a batched set of package updates pending, I've pushed > them to master-next, with more to come in the next few days. > > Once I merge them to master, I'll cherry-pick the equivalent > update to this to kirkstone. > > Bruce > > In message: [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 > on 06/07/2022 Chen Qi wrote: > > > Signed-off-by: Chen Qi <Qi.Chen@windriver.com> > > --- > > .../containerd/containerd-opencontainers_git.bb | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb > > index b0f92b12..c28b1510 100644 > > --- a/recipes-containers/containerd/containerd-opencontainers_git.bb > > +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb > > @@ -5,7 +5,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and > > support as well as checkpoint and restore for cloning and live migration of containers." > > > > > > -SRCREV = "d12516713c315ea9e651eb1df89cf32ff7c8137c" > > +SRCREV = "10c12954828e7c7c9b6e0ea9b0c02b01407d3ae1" > > SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \ > > file://0001-Add-build-option-GODEBUG-1.patch \ > > file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ > > @@ -15,8 +15,8 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=ht > > LICENSE = "Apache-2.0" > > LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" > > > > -CONTAINERD_VERSION = "v1.6.1" > > -CVE_VERSION = "1.6.1" > > +CONTAINERD_VERSION = "v1.6.6" > > +CVE_VERSION = "1.6.6" > > > > EXTRA_OEMAKE += "GODEBUG=1" > > > > @@ -56,7 +56,7 @@ do_compile() { > > metrics filters identifiers labels leases plugin server services \ > > cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \ > > cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \ > > - shutdown schedcore tracing; do > > + shutdown schedcore tracing kmutex; do > > if [ -d ${S}/src/import/${c} ]; then > > ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c} > > fi > > -- > > 2.37.0 > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#7414): https://lists.yoctoproject.org/g/meta-virtualization/message/7414 > > Mute This Topic: https://lists.yoctoproject.org/mt/92223491/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 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-07-20 15:08 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-07-07 6:29 [meta-virtualization][master][kirkstone][PATCH] containerd: upgrade to 1.6.6 Chen Qi 2022-07-07 14:57 ` Bruce Ashfield 2022-07-20 1:52 ` Chen, Qi 2022-07-20 15:08 ` 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.