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

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 622921f8d63db890dbe71f48c03e7ea8aadfae68..e99b77eb50051b458f657a1814fd90c86de417b0 100644 (file)
--- 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 ff3abc429f5248456421c171b80f7002eaf5e031..b88ea9c5edc7e8a82da30242f04d228c8afadb6a 100644 (file)
--- a/man/systemd-measure.xml
+++ b/man/systemd-measure.xml
@@ -3,7 +3,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-<refentry id="systemd-measure" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='ENABLE_BOOTLOADER'>
+<refentry id="systemd-measure" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='HAVE_TPM2'>
 
   <refentryinfo>
     <title>systemd-measure</title>

diff --git a/man/systemd-pcrlock.xml b/man/systemd-pcrlock.xml
index f82268c67583f3b86abcd519797114e9d981118c..30c4dae7e3ceefc997192af9d3296bfa986ac9ff 100644 (file)
--- a/man/systemd-pcrlock.xml
+++ b/man/systemd-pcrlock.xml
@@ -3,7 +3,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
-<refentry id="systemd-pcrlock" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='ENABLE_BOOTLOADER'>
+<refentry id="systemd-pcrlock" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='HAVE_TPM2'>
 
   <refentryinfo>
     <title>systemd-pcrlock</title>