]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
units: don't install pcrphase-related units without gnu-efi
authorFrantisek Sumsal <frantisek@sumsal.cz>
Tue, 17 Jan 2023 11:14:13 +0000 (12:14 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 17 Jan 2023 13:30:02 +0000 (14:30 +0100)
since we don't have systemd-pcrphase built anyway, which breaks the tests:

...
I: Attempting to install /usr/lib/systemd/systemd-networkd-wait-online (based on unit file reference)
I: Attempting to install /usr/lib/systemd/systemd-network-generator (based on unit file reference)
I: Attempting to install /usr/lib/systemd/systemd-oomd (based on unit file reference)
I: Attempting to install /usr/lib/systemd/systemd-pcrphase (based on unit file reference)
W: Failed to install '/usr/lib/systemd/systemd-pcrphase'
make: *** [Makefile:4: setup] Error 1
make: Leaving directory '/root/systemd/test/TEST-01-BASIC'

Follow-up to 04959faa632272a8fc9cdac3121b2e4af721c1b6.

units/meson.build

index d59796b62b6d46d864f1c89922049956815d7418..c7939a10f8147efb3384ee2f0ac4bbaeb2e482ea 100644 (file)
@@ -267,8 +267,8 @@ in_units = [
          'sysinit.target.wants/'],
         ['systemd-pcrmachine.service',           'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2',
          'sysinit.target.wants/'],
-        ['systemd-pcrfs-root.service',           ''],
-        ['systemd-pcrfs@.service',               ''],
+        ['systemd-pcrfs-root.service',           'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2'],
+        ['systemd-pcrfs@.service',               'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2'],
         ['systemd-growfs-root.service',          ''],
         ['systemd-growfs@.service',              ''],
 ]