From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 4 Jul 2024 09:12:35 +0000 (+0200)
Subject: meson: Deal with potential stable versions
X-Git-Tag: v257-rc1~971
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b3b01c4b7e0fde39b4be354990ee68f5e612c52;p=thirdparty%2Fsystemd.git

meson: Deal with potential stable versions

The meson.version file might contain e.g. 256.2~devel in a stable
branch so let's make sure we deal with that.
---

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index bcfccfaddc8..f916b6a441c 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -390,8 +390,8 @@ foreach efi_elf_binary : efi_elf_binaries
                 install_tag : 'systemd-boot',
                 command : [
                         elf2efi_py,
-                        '--version-major=' + meson.project_version().split('~')[0],
-                        '--version-minor=0',
+                        '--version-major=' + meson.project_version().split('.')[0].split('~')[0],
+                        '--version-minor=' + meson.project_version().split('.')[-1].split('~')[0],
                         '--efi-major=1',
                         '--efi-minor=1',
                         '--subsystem=10',