diff --git a/containerd.spec b/containerd.spec index 625299bca0df8ce84057fa3834d2d19456f4d726..72bb02cb61ad0f627c33a61ba153c49e6d23ce75 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.2.0 Name: containerd -Release: 304 +Release: 305 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -30,6 +30,7 @@ cp %{SOURCE3} . cp %{SOURCE4} . %build +echo %{VERSION}.%{RELEASE} > containerd_version bash ./apply-patch GO_BUILD_PATH=$PWD/_build @@ -52,6 +53,12 @@ install -p -m 755 bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim %{_bindir}/containerd-shim %changelog +* Wed Nov 16 2022 zhongjiawei - 1.2.0-305 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: fix version number wrong + * Thu Sep 22 2022 zhongjiawei - 1.2.0-304 - Type:bugfix - ID:NA diff --git a/git-commit b/git-commit index c3e5843990ea102a278d858d2d14f9206a37eae8..2ef302539e42ad842db546fa77b23eef74a16cfe 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -12d183fff48f375fac852537ae9677c0efa407ec +e6eb87f907c974224e5fe4da723815fa9618a3b2 diff --git a/patch/0093-containerd-fix-version-number-wrong.patch b/patch/0093-containerd-fix-version-number-wrong.patch new file mode 100644 index 0000000000000000000000000000000000000000..f2a41d78cf2180a5fca587e8fffd26a9f77f6fb3 --- /dev/null +++ b/patch/0093-containerd-fix-version-number-wrong.patch @@ -0,0 +1,36 @@ +From aca59a554842337e5e03b300a5f358a3fa9c80e4 Mon Sep 17 00:00:00 2001 +From: zhongjiawei +Date: Wed, 16 Nov 2022 12:28:54 +0800 +Subject: [PATCH] containerd: fix version number wrong + +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 2bc5dd5..44eeefc 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,7 @@ ROOTDIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST)))) + DESTDIR=/usr/local + + # Used to populate variables in version package. +-VERSION=$(shell echo version:)$(shell grep '^Version' ${ROOTDIR}/containerd.spec | sed 's/[^0-9.]*\([0-9.]*\).*/\1/').$(shell grep '^Release:' ${ROOTDIR}/containerd.spec | sed 's/[^0-9.]*\([0-9.]*\).*/\1/') ++VERSION=$(shell echo version:)$(shell cat ./containerd_version) + REVISION=$(shell cat ./git-commit | head -c 40) + + ifneq "$(strip $(shell command -v go 2>/dev/null))" "" +@@ -181,8 +181,8 @@ bin/%: cmd/% FORCE + bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 + @echo "$(WHALE) bin/containerd-shim" + CGO_ENABLED=1 \ +- CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \ +- CGO_CPPFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \ ++ CGO_CFLAGS="-fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2" \ ++ CGO_CPPFLAGS="-fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2" \ + CGO_LDFLAGS_ALLOW='-Wl,-z,relro,-z,now' \ + CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \ + go build -buildmode=pie ${GO_BUILD_FLAGS} -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim +-- +2.30.0 + diff --git a/series.conf b/series.conf index f7bbc655ce24d011b0d9bf0efb6edfeb9e1412a1..68acc964aef21a626030eb22fa8debc53a5572f7 100644 --- a/series.conf +++ b/series.conf @@ -97,4 +97,5 @@ patch/0089-containerd-Add-lock-for-ListPids.patch patch/0090-images-validate-document-type-before-unmarshal.patch patch/0091-schema1-reject-ambiguous-documents.patch patch/0092-containerd-add-CGO-sercurity-build-options.patch +patch/0093-containerd-fix-version-number-wrong.patch # end