Skip to content

Commit

Permalink
units: don't install pcrphase-related units without gnu-efi
Browse files Browse the repository at this point in the history
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 04959fa.

(cherry picked from commit 0eb635e)

Related: RHEL-33384
  • Loading branch information
mrc0mmand authored and github-actions[bot] committed May 15, 2024
1 parent 41d2e7f commit 0947147
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions units/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ in_units = [
'sysinit.target.wants/'],
['systemd-pcrphase.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', ''],
['systemd-pcrmachine.service', 'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2',
Expand Down

0 comments on commit 0947147

Please sign in to comment.