diff options
| author | Jan Janssen <medhefgo@web.de> | 2023-08-25 13:07:55 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-08-26 06:53:42 +0200 |
| commit | c78b611e48fbfb6963a300c7f0b35b0dded5f4cf (patch) | |
| tree | 7dc9031c91950a1d2166dc5c92f40ec044ea896d /src/boot/efi/meson.build | |
| parent | mount/mount-tool: return correct errno (diff) | |
| download | systemd-c78b611e48fbfb6963a300c7f0b35b0dded5f4cf.tar.xz systemd-c78b611e48fbfb6963a300c7f0b35b0dded5f4cf.zip | |
meson: Bring back use of vcs_tag
The use of vcs_tag was dropped in #28567, which results in builds having
stale version information once new commit are made.
This also fixes a case where CI builds would have no version information
because they are checked out without any tags for git-describe to use.
Additionally, use `--git-dir` now, as that particular issues seems to
have been fixed by now.
Diffstat (limited to 'src/boot/efi/meson.build')
| -rw-r--r-- | src/boot/efi/meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index e35ab91402..0effa90c15 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -92,9 +92,11 @@ elif get_option('sbat-distro') != '' pkgver = get_option('sbat-distro-version') if pkgver == '' - pkgver = version_tag + # This is determined during build, not configuration, so we can't display it yet. + efi_conf.set('SBAT_DISTRO_VERSION', 'GIT_VERSION') + else + efi_conf.set_quoted('SBAT_DISTRO_VERSION', pkgver) endif - efi_conf.set_quoted('SBAT_DISTRO_VERSION', pkgver) endif summary({'UEFI architectures' : efi_arch + (efi_arch_alt == '' ? '' : ', ' + efi_arch_alt)}, |