]> git.99rst.org Git - openwrt-packages.git/commitdiff
oci-runtime-tools: report the real version string
authorDaniel Golle <redacted>
Sun, 23 Aug 2026 18:29:42 +0000 (19:29 +0100)
committerDaniel Golle <redacted>
Sun, 23 Aug 2026 22:37:55 +0000 (23:37 +0100)
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 ("<hash>, commit: <hash>") 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 <redacted>
utils/oci-runtime-tools/Makefile

index 988b02b80e0e9587d6410a7dab59bfa41d6bcbca..f550449f211b7d97dc98873a1ada2f9889dfc8ef 100644 (file)
@@ -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
 
git clone https://git.99rst.org/PROJECT