From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 25 Oct 2023 14:48:35 +0000 (+0200)
Subject: meson: Always build systemd-measure
X-Git-Tag: v255-rc1~138^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e7ea1b1c876c3e4837b633ed6f30fb9e50f9d76;p=thirdparty%2Fsystemd.git

meson: Always build systemd-measure

Same idea as with bootctl, we might be doing image builds from a
system that doesn't boot with UEFI but we still might want to measure
stuff for the image we're building so let's not gate this behind
ENABLE_BOOTLOADER.
---

diff --git a/man/rules/meson.build b/man/rules/meson.build
index f664901ebb3..106b80f3149 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -990,7 +990,7 @@ manpages = [
    'systemd-makefs',
    'systemd-mkswap@.service'],
   ''],
- ['systemd-measure', '1', [], 'ENABLE_BOOTLOADER'],
+ ['systemd-measure', '1', [], ''],
  ['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'],
  ['systemd-mount', '1', ['systemd-umount'], ''],
  ['systemd-network-generator.service', '8', ['systemd-network-generator'], ''],
diff --git a/src/boot/meson.build b/src/boot/meson.build
index c376744a7b7..55b9bd6294b 100644
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -56,7 +56,6 @@ executables += [
                 'name' : 'systemd-measure',
                 'conditions' : [
                         'HAVE_BLKID',
-                        'ENABLE_BOOTLOADER',
                         'HAVE_OPENSSL',
                         'HAVE_TPM2',
                 ],