39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
|
From 0c10761f1cb7a5d9d7d98c68891f0b67cbbee9f3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhongjiawei <zhongjiawei1@huawei.com>
|
||
|
|
Date: Wed, 16 Nov 2022 14:40:08 +0800
|
||
|
|
Subject: [PATCH] containerd: fix version number wrong
|
||
|
|
|
||
|
|
---
|
||
|
|
Makefile | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 1303770..44eeefc 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -20,8 +20,8 @@ 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/')
|
||
|
|
-REVISION=$(shell echo commit:)$(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
|
||
|
|
+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))" ""
|
||
|
|
GOOS ?= $(shell go env GOOS)
|
||
|
|
@@ -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
|
||
|
|
|