meson: Only take the version from dtc's own git repository
Some checks are pending
Build test / build-linux (make, fedora) (push) Waiting to run
Build test / build-linux (make, alpine) (push) Waiting to run
Build test / build-linux (make, archlinux) (push) Waiting to run
Build test / build-macos (make) (push) Waiting to run
Build test / build-linux (make, ubuntu) (push) Waiting to run
Build test / build-linux (meson, alpine) (push) Waiting to run
Build test / build-linux (meson, archlinux) (push) Waiting to run
Build test / build-linux (meson, fedora) (push) Waiting to run
Build test / build-linux (meson, ubuntu) (push) Waiting to run
Build test / build-macos (meson) (push) Waiting to run
Build test / mingw32 (push) Waiting to run
Build test / clang64 (push) Waiting to run
Build test / mingw64 (push) Waiting to run
Build test / ucrt64 (push) Waiting to run
Build test / FreeBSD 13.5 make build (push) Waiting to run
Build test / FreeBSD 14.3 make build (push) Waiting to run
Build test / FreeBSD 13.5 meson build (push) Waiting to run
Build test / FreeBSD 14.3 meson build (push) Waiting to run

When dtc is built from a release tarball unpacked inside another git
repository, git describe finds that repository and its tag ends up in the
version string, so dtc --version reports the tag rather than "DTC 1.8.1".
Point git at dtc's own .git, so that vcs_tag falls back to the project
version when there is none.

Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Rudi Heitbaum 2026-10-06 21:46:26 +11:00 • committed by David Gibson
parent 7a1e017926
commit f3451d1253

View file

@ -47,7 +47,7 @@ pylibfdt_enabled = not meson.is_cross_build() and py.found() and swig.found() ?
wheel_only = get_option('wheel-only')
version_gen_h = vcs_tag(
command: ['git', 'describe', '--dirty=+'],
command: ['git', '--git-dir=.git', 'describe', '--dirty=+'],
input: 'version_gen.h.in',
output: 'version_gen.h',
)