diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-02-16 16:58:58 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-02-21 14:01:25 +0100 |
| commit | 3f6ce3d4f04de0f765bb3bde0e400d0823829486 (patch) | |
| tree | dffc973b75f87412a4298f251abeaa8a6fd92fc1 /src/boot/efi/meson.build | |
| parent | Set SYSTEMD_LOG_LEVEL=info explicitly in test-sysusers (diff) | |
| download | systemd-3f6ce3d4f04de0f765bb3bde0e400d0823829486.tar.xz systemd-3f6ce3d4f04de0f765bb3bde0e400d0823829486.zip | |
meson: Decouple the version tag from the vcs tag
Let's split off a new vcs-tag option from version-tag that configures whether
the current commit should be appended to the version tag. Doing this saves
us from having to fiddle around with generating git versions in packaging
specs and instead let's meson do it for us, even if we pass in a custom
version tag.
With this approach there's no more need for tools/meson-vcs-tag.sh so
we remove it.
Diffstat (limited to 'src/boot/efi/meson.build')
| -rw-r--r-- | src/boot/efi/meson.build | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index 2e22bdf57f..b5d4e96303 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -68,6 +68,7 @@ if meson.is_cross_build() and get_option('sbat-distro') == 'auto' elif get_option('sbat-distro') != '' efi_conf.set_quoted('SBAT_PROJECT', meson.project_name()) efi_conf.set_quoted('PROJECT_VERSION', meson.project_version().split('~')[0]) + efi_conf.set_quoted('VERSION_TAG', version_tag) efi_conf.set('PROJECT_URL', conf.get('PROJECT_URL')) if get_option('sbat-distro-generation') < 1 error('SBAT Distro Generation must be a positive integer') |