diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-07-31 00:40:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-31 00:40:51 +0200 |
| commit | 6c0ac118d2ec157f2af3735e5c9998a5f8a7e65b (patch) | |
| tree | 3995ff84e934657b2f9806e972a1e1d747bec706 /src/boot/efi/meson.build | |
| parent | Merge pull request #28573 from yuwata/network-address-next-part2 (diff) | |
| parent | meson: unconditionally add version dependency for all executables and libraries (diff) | |
| download | systemd-6c0ac118d2ec157f2af3735e5c9998a5f8a7e65b.tar.xz systemd-6c0ac118d2ec157f2af3735e5c9998a5f8a7e65b.zip | |
Merge pull request #28567 from yuwata/meson-versiondep
meson: cleanups for version dependency
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 e99bdb8748..3eecaf474b 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') |