From: Changqing Li <changqing...@windriver.com> Update Makefile 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
Signed-off-by: Changqing Li <changqing...@windriver.com> --- ...file-update-PACKAGE-and-PKG-settings.patch | 41 +++++++++++++++++++ .../containerd-opencontainers_git.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-PACKAGE-and-PKG-settings.patch diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-PACKAGE-and-PKG-settings.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-PACKAGE-and-PKG-settings.patch new file mode 100644 index 00000000..bc70c199 --- /dev/null +++ b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-PACKAGE-and-PKG-settings.patch @@ -0,0 +1,41 @@ +From 26b4a947ebd3ed50af46bf882009b53b92a9f094 Mon Sep 17 00:00:00 2001 +From: Changqing Li <changqing...@windriver.com> +Date: Wed, 24 Apr 2024 13:58:27 +0800 +Subject: [PATCH] Makefile: update PACKAGE and PKG settings + +Current settings make containerd version is displayed +as "2.0.0-rc.1+unknown", update PACKAGE and PKG settings to +correct the version + +Upstream-Status: Submitted [https://github.com/containerd/containerd/pull/10125] + +Signed-off-by: Changqing Li <changqing...@windriver.com> +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index a5b244191..a68c07038 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))" "" +@@ -81,7 +81,7 @@ STATICRELEASE=containerd-static-$(VERSION:v%=%)-${GOOS}-${GOARCH} + CRIRELEASE=cri-containerd-$(VERSION:v%=%)-${GOOS}-${GOARCH} + CRICNIRELEASE=cri-containerd-cni-$(VERSION:v%=%)-${GOOS}-${GOARCH} + +-PKG=github.com/containerd/containerd/v2 ++PKG=github.com/containerd/containerd + + # Project binaries. + COMMANDS=ctr containerd containerd-stress +-- +2.25.1 + diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index 10d1ce8b..8df22432 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -9,6 +9,7 @@ SRCREV = "b1624c3628954e769dd50783b63823040b2db38c" SRC_URI = "git://github.com/containerd/containerd;branch=main;protocol=https;destsuffix=git/src/github.com/containerd/containerd \ 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-Makefile-update-PACKAGE-and-PKG-settings.patch \ " # Apache-2.0 for containerd -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8696): https://lists.yoctoproject.org/g/meta-virtualization/message/8696 Mute This Topic: https://lists.yoctoproject.org/mt/105706505/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
