MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

containerd-opencontainers: fix wrong version display

Browse Source 
* Update containerd to v2 to fix following containerd version:
containerd github.com/containerd/containerd/v2 2.0.0-beta.0+unknown
it should be like:
containerd github.com/containerd/containerd/v2 v2.0.0-beta.2-204-gb1624c362.m b1624c3628954e769dd50783b63823040b2db38c.m

* Remove CONTAINERD_PKG, it is not used

* Update default PACKAGE in Makefile to v2

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Changqing Li 2024-04-24 18:47:38 +08:00 committed by Bruce Ashfield
parent 7ccaa4ac22
commit e46214eea8
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch Normal file
View File

@ -0,0 +1,28 @@
From eb39888898a9d196e3eb63724c6c07777f3b9402 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Wed, 24 Apr 2024 14:10:11 +0800
Subject: [PATCH] Makefile: update default PACKAGE to v2
Upstream-Status: Submitted [https://github.com/containerd/containerd/pull/10125]
Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index a5b244191..cb9ff4172 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ TEST_IMAGE_LIST ?=
# Used to populate variables in version package.
VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
-PACKAGE=github.com/containerd/containerd
+PACKAGE=github.com/containerd/containerd/v2
SHIM_CGO_ENABLED ?= 0
ifneq "$(strip $(shell command -v $(GO) 2>/dev/null))" ""
--
2.25.1

7
recipes-containers/containerd/containerd-opencontainers_git.bb
View File

@ -6,9 +6,10 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
SRCREV = "b1624c3628954e769dd50783b63823040b2db38c" SRCREV = "b1624c3628954e769dd50783b63823040b2db38c"
SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd \ SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd/v2 \
file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \ file://0001-build-don-t-use-gcflags-to-define-trimpath.patch \
file://0001-Makefile-update-default-PACKAGE-to-v2.patch \
" "
# Apache-2.0 for containerd # Apache-2.0 for containerd
@ -23,7 +24,7 @@ CVE_VERSION = "v2.0.0-beta.0"
PROVIDES += "virtual/containerd" PROVIDES += "virtual/containerd"
RPROVIDES:${PN} = "virtual-containerd" RPROVIDES:${PN} = "virtual-containerd"
S = "${WORKDIR}/git/src/github.com/containerd/containerd" S = "${WORKDIR}/git/src/github.com/containerd/containerd/v2"
PV = "${CONTAINERD_VERSION}+git" PV = "${CONTAINERD_VERSION}+git"
@ -32,8 +33,6 @@ inherit goarch
GO_IMPORT = "import" GO_IMPORT = "import"
CONTAINERD_PKG="github.com/containerd/containerd"
INSANE_SKIP:${PN} += "ldflags" INSANE_SKIP:${PN} += "ldflags"
do_configure[noexec] = "1" do_configure[noexec] = "1"