From c316c01936aa5333f13ddafcc5ef3ee030b4ab00 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 23 Aug 2026 19:29:42 +0100 Subject: [PATCH] oci-runtime-tools: report the real version string main.version was linked to PKG_SOURCE_VERSION, the upstream commit hash, rather than PKG_VERSION, the human-readable string everything else (the tarball name, the package version, CI's own version probe) actually means by "version". oci-runtime-tool --version therefore printed the commit hash twice (", commit: ") and never the string 1.3.0.20260316, which is what CI's generic runtime test greps stdout for, so the check failed on every push regardless of this PR's actual content. gitCommit stays on PKG_SOURCE_VERSION, since that is genuinely what it is; only version was wrong. Signed-off-by: Daniel Golle --- utils/oci-runtime-tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/oci-runtime-tools/Makefile b/utils/oci-runtime-tools/Makefile index 988b02b80e..f550449f21 100644 --- a/utils/oci-runtime-tools/Makefile +++ b/utils/oci-runtime-tools/Makefile @@ -20,7 +20,7 @@ PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/opencontainers/runtime-tools/ -GO_PKG_LDFLAGS_X:=main.gitCommit=$(PKG_SOURCE_VERSION) main.version=$(PKG_SOURCE_VERSION) +GO_PKG_LDFLAGS_X:=main.gitCommit=$(PKG_SOURCE_VERSION) main.version=$(PKG_VERSION) BUSYBOX_STATIC_VERSION:=1.31.0