| Message ID | 20201216080013.547261-2-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:09 -0800 Christian Stewart <christian@paral.in> wrote: > 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/runc/runc.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:09 -0800 > Christian Stewart <christian@paral.in> wrote: >> 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/runc/runc.mk | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) Committed to 2020.02.x and 2020.11.x, thanks.
diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 3d177d23d5..393bd7b22f 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -9,7 +9,7 @@ RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE -RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION) +RUNC_LDFLAGS = -X main.version=$(RUNC_VERSION) RUNC_TAGS = cgo static_build ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)