diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-07-29 15:42:27 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-07-29 21:54:47 +0200 |
| commit | 4122d686824d85620db1220b2f1658ede8daa80d (patch) | |
| tree | 30f2453a5e14880ded5cc0eb45e5754337a4b58d /src/boot/efi/meson.build | |
| parent | meson: drop short script to generate vcs tag (diff) | |
| download | systemd-4122d686824d85620db1220b2f1658ede8daa80d.tar.xz systemd-4122d686824d85620db1220b2f1658ede8daa80d.zip | |
boot: always set SBAT_DISTRO_VERSION
Diffstat (limited to 'src/boot/efi/meson.build')
| -rw-r--r-- | src/boot/efi/meson.build | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index 1c52629651..62c5385f69 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -98,13 +98,9 @@ elif get_option('sbat-distro') != '' pkgver = get_option('sbat-distro-version') if pkgver == '' - efi_conf.set('SBAT_DISTRO_VERSION', 'GIT_VERSION') - # This is determined during build, not configuration, so we can't display it yet. - sbat_distro_version_display = '(git version)' - else - efi_conf.set_quoted('SBAT_DISTRO_VERSION', pkgver) - sbat_distro_version_display = pkgver + pkgver = version_tag endif + efi_conf.set_quoted('SBAT_DISTRO_VERSION', pkgver) endif summary({'UEFI architectures' : efi_arch + (efi_arch_alt == '' ? '' : ', ' + efi_arch_alt)}, @@ -114,7 +110,7 @@ if efi_conf.get('SBAT_DISTRO', '') != '' summary({ 'SBAT distro': efi_conf.get('SBAT_DISTRO'), 'SBAT distro generation': efi_conf.get('SBAT_DISTRO_GENERATION'), - 'SBAT distro version': sbat_distro_version_display, + 'SBAT distro version': efi_conf.get('SBAT_DISTRO_VERSION'), 'SBAT distro summary': efi_conf.get('SBAT_DISTRO_SUMMARY'), 'SBAT distro URL': efi_conf.get('SBAT_DISTRO_URL')}, section : 'UEFI') |