From d45ca9a9051d396dc8bf484072b10bec21ad2e3e Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 22 Dec 2023 21:58:04 +0100 Subject: [PATCH] man: conditionalize sd-pcrlock and sd-measure on the same variable as their binaries The binaries are built and installed if HAVE_TPM2 is set, and ignore ENABLE_BOOTLOADER, so do the same for the manpages. For the sd-pcrlock case this also installs the manpage aliases for the units, which are not installed with -Dbootloader=disabled, but there's no way to conditionalize the aliases, so on balance it's better to have too much documentation rather than too little. Fixes https://github.com/systemd/systemd/issues/30588 --- man/rules/meson.build | 4 ++-- man/systemd-measure.xml | 2 +- man/systemd-pcrlock.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/rules/meson.build b/man/rules/meson.build index 622921f8d63..e99b77eb500 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -991,7 +991,7 @@ manpages = [ 'systemd-makefs', 'systemd-mkswap@.service'], ''], - ['systemd-measure', '1', [], 'ENABLE_BOOTLOADER'], + ['systemd-measure', '1', [], 'HAVE_TPM2'], ['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'], ['systemd-mount', '1', ['systemd-umount'], ''], ['systemd-network-generator.service', '8', ['systemd-network-generator'], ''], @@ -1013,7 +1013,7 @@ manpages = [ 'systemd-pcrlock-make-policy.service', 'systemd-pcrlock-secureboot-authority.service', 'systemd-pcrlock-secureboot-policy.service'], - 'ENABLE_BOOTLOADER'], + 'HAVE_TPM2'], ['systemd-pcrphase.service', '8', ['systemd-pcrextend', diff --git a/man/systemd-measure.xml b/man/systemd-measure.xml index ff3abc429f5..b88ea9c5edc 100644 --- a/man/systemd-measure.xml +++ b/man/systemd-measure.xml @@ -3,7 +3,7 @@ - + systemd-measure diff --git a/man/systemd-pcrlock.xml b/man/systemd-pcrlock.xml index f82268c6758..30c4dae7e3c 100644 --- a/man/systemd-pcrlock.xml +++ b/man/systemd-pcrlock.xml @@ -3,7 +3,7 @@ - + systemd-pcrlock