| Message ID | 20201216080013.547261-1-christian@paral.in |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/5] package/docker-containerd: fix version output ldflags | expand |
On Wed, 16 Dec 2020 00:00:08 -0800 Christian Stewart <christian@paral.in> wrote: > From: Tian Yuanhao <52117554+tianyuanhao@users.noreply.github.com> > > Fix the ldflags specifying the version info for "version" command. > > Signed-off-by: Christian Stewart <christian@paral.in> > Signed-off-by: Tian Yuanhao <tianyuanhao@aliyun.com> > --- > package/docker-containerd/docker-containerd.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes: > On Wed, 16 Dec 2020 00:00:08 -0800 > Christian Stewart <christian@paral.in> wrote: >> From: Tian Yuanhao <52117554+tianyuanhao@users.noreply.github.com> >> >> Fix the ldflags specifying the version info for "version" command. >> >> Signed-off-by: Christian Stewart <christian@paral.in> >> Signed-off-by: Tian Yuanhao <tianyuanhao@aliyun.com> >> --- >> package/docker-containerd/docker-containerd.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > Applied to master, thanks. Committed to 2020.11.x, thanks.
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index d9a0eb28a6..6b79bd14ae 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -12,7 +12,7 @@ DOCKER_CONTAINERD_LICENSE_FILES = LICENSE DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd DOCKER_CONTAINERD_LDFLAGS = \ - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) + -X $(DOCKER_CONTAINERD_GOMOD)/version.Version=$(DOCKER_CONTAINERD_VERSION) DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim