From 26575938356010540c9536857c2c58dbe45bc80e Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Fri, 14 Jun 2024 17:56:29 +0000 Subject: [PATCH] runc: fix how version is set after upstream change Upstream changed how the binary version can be set which broke how we were setting it. Now we can pass a VERSION env var into runcs make file to have it use that instead of modifying the VERSION file in the repo. Because we already have a VERSION field set in the env, the runc makefile is taking that, but it does not contain the revision number, so we need to modify that env. Signed-off-by: Brian Goff --- cmd/run_tests/main.go | 2 ++ packages/moby-runc/deb.mk | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/run_tests/main.go b/cmd/run_tests/main.go index d05a902..87025cd 100755 --- a/cmd/run_tests/main.go +++ b/cmd/run_tests/main.go @@ -59,6 +59,8 @@ func runTest(args Args) error { return fmt.Errorf("unrecognized distro: %s", pkgOs) } + fmt.Fprintf(os.Stderr, "%+v\n%s", s, pv) + fmt.Printf(` DISTRO=%[1]s TARGETARCH=%[2]s diff --git a/packages/moby-runc/deb.mk b/packages/moby-runc/deb.mk index 72213fb..243e022 100644 --- a/packages/moby-runc/deb.mk +++ b/packages/moby-runc/deb.mk @@ -2,8 +2,7 @@ deb: runc man/man8 runc: cd src && \ - echo $(VERSION)-$(REVISION) > VERSION && \ - $(MAKE) runc BUILDTAGS='seccomp' + $(MAKE) runc BUILDTAGS='seccomp' VERSION="${VERSION}-${REVISION}" man/man8: cd src && \