diff options
-rw-r--r-- | recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch | 28 | ||||
-rw-r--r-- | recipes-containers/containerd/containerd_git.bb | 5 |
2 files changed, 2 insertions, 31 deletions
diff --git a/recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch b/recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch deleted file mode 100644 index 74e313b5..00000000 --- a/recipes-containers/containerd/containerd/0001-Makefile-update-default-PACKAGE-to-v2.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From eb39888898a9d196e3eb63724c6c07777f3b9402 Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Wed, 24 Apr 2024 14:10:11 +0800 | ||
4 | Subject: [PATCH] Makefile: update default PACKAGE to v2 | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/containerd/containerd/pull/10125] | ||
7 | |||
8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
9 | --- | ||
10 | Makefile | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/Makefile b/Makefile | ||
14 | index a5b244191..cb9ff4172 100644 | ||
15 | --- a/Makefile | ||
16 | +++ b/Makefile | ||
17 | @@ -34,7 +34,7 @@ TEST_IMAGE_LIST ?= | ||
18 | # Used to populate variables in version package. | ||
19 | VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always) | ||
20 | REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) | ||
21 | -PACKAGE=github.com/containerd/containerd | ||
22 | +PACKAGE=github.com/containerd/containerd/v2 | ||
23 | SHIM_CGO_ENABLED ?= 0 | ||
24 | |||
25 | ifneq "$(strip $(shell command -v $(GO) 2>/dev/null))" "" | ||
26 | -- | ||
27 | 2.25.1 | ||
28 | |||
diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd_git.bb index 4d900d01..ef1de98d 100644 --- a/recipes-containers/containerd/containerd_git.bb +++ b/recipes-containers/containerd/containerd_git.bb | |||
@@ -5,18 +5,17 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and | |||
5 | support as well as checkpoint and restore for cloning and live migration of containers." | 5 | support as well as checkpoint and restore for cloning and live migration of containers." |
6 | 6 | ||
7 | 7 | ||
8 | SRCREV = "b1624c3628954e769dd50783b63823040b2db38c" | 8 | SRCREV = "0426e3c2eb39b246f783cb16d0980ed9e0e69563" |
9 | SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \ | 9 | SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \ |
10 | file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ | 10 | file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ |
11 | file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \ | 11 | file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \ |
12 | file://0001-Makefile-update-default-PACKAGE-to-v2.patch \ | ||
13 | " | 12 | " |
14 | 13 | ||
15 | # Apache-2.0 for containerd | 14 | # Apache-2.0 for containerd |
16 | LICENSE = "Apache-2.0" | 15 | LICENSE = "Apache-2.0" |
17 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89" | 16 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1269f40c0d099c21a871163984590d89" |
18 | 17 | ||
19 | CONTAINERD_VERSION = "v2.0.0-beta.0" | 18 | CONTAINERD_VERSION = "v2.0.0-rc.1" |
20 | CVE_VERSION = "v2.0.0-beta.0" | 19 | CVE_VERSION = "v2.0.0-beta.0" |
21 | 20 | ||
22 | # EXTRA_OEMAKE += "GODEBUG=1" | 21 | # EXTRA_OEMAKE += "GODEBUG=1" |