From 2fade8857548beb55275eb3bc13676d2939353c8 Mon Sep 17 00:00:00 2001 From: 5schatten Date: Thu, 15 Nov 2018 01:14:46 +0100 Subject: [PATCH] containerd: updated LDFLAGS to fix --version / --info output --- packages/addons/addon-depends/containerd/package.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk index b82e13c776..51c7f420df 100644 --- a/packages/addons/addon-depends/containerd/package.mk +++ b/packages/addons/addon-depends/containerd/package.mk @@ -38,7 +38,11 @@ pre_make_target() { export CGO_ENABLED=1 export CGO_NO_EMULATION=1 export CGO_CFLAGS=$CFLAGS - export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $CC" + # Update CONTAINERD_VERSION if you update the PKG_VERSION + export CONTAINERD_VERSION=v1.2.0 + export CONTAINERD_REVISION=$PKG_VERSION + export CONTAINERD_PKG=github.com/containerd/containerd + export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC" export GOLANG=$TOOLCHAIN/lib/golang/bin/go export GOPATH=$PKG_BUILD/.gopath export GOROOT=$TOOLCHAIN/lib/golang