[Buildroot] [PATCH v1 1/1] package/containerd: bump to version v2.0.2

[Buildroot] [PATCH v1 1/1] package/containerd: bump to version v2.0.2

[Christian Stewart via buildroot]

Major release v1 -> v2.

Dropped patch as it is no longer necessary:
https://github.com/containerd/containerd/pull/8924

containerd-shim and containerd-shim-runc-v1 were removed.

https://github.com/containerd/containerd/releases/tag/v2.0.2

Signed-off-by: Christian Stewart <christian@aperture.us>
---
 package/containerd/containerd.hash | 2 +-
 package/containerd/containerd.mk   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash
index e3f8434192..4ec78897d9 100644
--- a/package/containerd/containerd.hash
+++ b/package/containerd/containerd.hash
@@ -1,3 +1,3 @@
 # Computed locally
-sha256  393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c  containerd-1.7.23-go2.tar.gz
+sha256  472747a7a6b360a0864bab0ee00a8a6f51da5795171e6a60ab17aa80cbd850a2  containerd-2.0.2-go2.tar.gz
 sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE
diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk
index 88b53caf51..ee07c22495 100644
--- a/package/containerd/containerd.mk
+++ b/package/containerd/containerd.mk
@@ -4,21 +4,19 @@
 #
 ################################################################################
 
-CONTAINERD_VERSION = 1.7.23
+CONTAINERD_VERSION = 2.0.2
 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION))
 CONTAINERD_LICENSE = Apache-2.0
 CONTAINERD_LICENSE_FILES = LICENSE
 CONTAINERD_CPE_ID_VENDOR = linuxfoundation
 
-CONTAINERD_GOMOD = github.com/containerd/containerd
+CONTAINERD_GOMOD = github.com/containerd/containerd/v2
 
 CONTAINERD_LDFLAGS = \
 	-X $(CONTAINERD_GOMOD)/version.Version=$(CONTAINERD_VERSION)
 
 CONTAINERD_BUILD_TARGETS = \
 	cmd/containerd \
-	cmd/containerd-shim \
-	cmd/containerd-shim-runc-v1 \
 	cmd/containerd-shim-runc-v2 \
 	cmd/ctr
 
-- 
2.39.5

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version v2.0.2

[Baruch Siach via buildroot]

Hi Christian,

On Thu, Jan 30 2025, Christian Stewart via buildroot wrote:
> Major release v1 -> v2.
>
> Dropped patch as it is no longer necessary:
> https://github.com/containerd/containerd/pull/8924

Which patch is dropped? I don't see any below.

baruch

> containerd-shim and containerd-shim-runc-v1 were removed.
>
> https://github.com/containerd/containerd/releases/tag/v2.0.2
>
> Signed-off-by: Christian Stewart <christian@aperture.us>
> ---
>  package/containerd/containerd.hash | 2 +-
>  package/containerd/containerd.mk   | 6 ++----
>  2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash
> index e3f8434192..4ec78897d9 100644
> --- a/package/containerd/containerd.hash
> +++ b/package/containerd/containerd.hash
> @@ -1,3 +1,3 @@
>  # Computed locally
> -sha256  393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c  containerd-1.7.23-go2.tar.gz
> +sha256  472747a7a6b360a0864bab0ee00a8a6f51da5795171e6a60ab17aa80cbd850a2  containerd-2.0.2-go2.tar.gz
>  sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE
> diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk
> index 88b53caf51..ee07c22495 100644
> --- a/package/containerd/containerd.mk
> +++ b/package/containerd/containerd.mk
> @@ -4,21 +4,19 @@
>  #
>  ################################################################################
>  
> -CONTAINERD_VERSION = 1.7.23
> +CONTAINERD_VERSION = 2.0.2
>  CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION))
>  CONTAINERD_LICENSE = Apache-2.0
>  CONTAINERD_LICENSE_FILES = LICENSE
>  CONTAINERD_CPE_ID_VENDOR = linuxfoundation
>  
> -CONTAINERD_GOMOD = github.com/containerd/containerd
> +CONTAINERD_GOMOD = github.com/containerd/containerd/v2
>  
>  CONTAINERD_LDFLAGS = \
>  	-X $(CONTAINERD_GOMOD)/version.Version=$(CONTAINERD_VERSION)
>  
>  CONTAINERD_BUILD_TARGETS = \
>  	cmd/containerd \
> -	cmd/containerd-shim \
> -	cmd/containerd-shim-runc-v1 \
>  	cmd/containerd-shim-runc-v2 \
>  	cmd/ctr

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version v2.0.2

[Peter Korsgaard]

>>>>> "Baruch" == Baruch Siach via buildroot <buildroot@buildroot.org> writes:

 > Hi Christian,
 > On Thu, Jan 30 2025, Christian Stewart via buildroot wrote:
 >> Major release v1 -> v2.
 >> 
 >> Dropped patch as it is no longer necessary:
 >> https://github.com/containerd/containerd/pull/8924

 > Which patch is dropped? I don't see any below.

Ups, I didn't notice this line or your comment before committing. It
indeed looks to be wrong.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version v2.0.2

[Christian Stewart via buildroot]

[-- Attachment #1.1: Type: text/plain, Size: 692 bytes --]

Hi Peter,

On Sat, Feb 1, 2025 at 2:40 AM Peter Korsgaard <peter@korsgaard.com> wrote:

> >>>>> "Baruch" == Baruch Siach via buildroot <buildroot@buildroot.org>
> writes:
>
>  > Hi Christian,
>  > On Thu, Jan 30 2025, Christian Stewart via buildroot wrote:
>  >> Major release v1 -> v2.
>  >>
>  >> Dropped patch as it is no longer necessary:
>  >> https://github.com/containerd/containerd/pull/8924
>
>  > Which patch is dropped? I don't see any below.
>
> Ups, I didn't notice this line or your comment before committing. It
> indeed looks to be wrong.
>

Indeed, I had that patch in my skiffos fork, my apologies for the mistake.

Best regards,
Christian Stewart

[-- Attachment #1.2: Type: text/html, Size: 1326 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/1] package/containerd: bump to version v2.0.2

[Peter Korsgaard]

>>>>> "Christian" == Christian Stewart <christian@aperture.us> writes:

 > Major release v1 -> v2.

 > Dropped patch as it is no longer necessary:
 > https://github.com/containerd/containerd/pull/8924

 > containerd-shim and containerd-shim-runc-v1 were removed.

 > https://github.com/containerd/containerd/releases/tag/v2.0.2

 > Signed-off-by: Christian Stewart <christian@aperture.us>

Committed, thanks.

Are the non-docker (E.G. nerdctl) packages compatible with this v2?

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot