mirror of
https://github.com/systemd/systemd
synced 2024-10-14 12:04:49 +00:00
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
This commit is contained in:
parent
60d52f219e
commit
d45ca9a905
|
@ -991,7 +991,7 @@ manpages = [
|
||||||
'systemd-makefs',
|
'systemd-makefs',
|
||||||
'systemd-mkswap@.service'],
|
'systemd-mkswap@.service'],
|
||||||
''],
|
''],
|
||||||
['systemd-measure', '1', [], 'ENABLE_BOOTLOADER'],
|
['systemd-measure', '1', [], 'HAVE_TPM2'],
|
||||||
['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'],
|
['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'],
|
||||||
['systemd-mount', '1', ['systemd-umount'], ''],
|
['systemd-mount', '1', ['systemd-umount'], ''],
|
||||||
['systemd-network-generator.service', '8', ['systemd-network-generator'], ''],
|
['systemd-network-generator.service', '8', ['systemd-network-generator'], ''],
|
||||||
|
@ -1013,7 +1013,7 @@ manpages = [
|
||||||
'systemd-pcrlock-make-policy.service',
|
'systemd-pcrlock-make-policy.service',
|
||||||
'systemd-pcrlock-secureboot-authority.service',
|
'systemd-pcrlock-secureboot-authority.service',
|
||||||
'systemd-pcrlock-secureboot-policy.service'],
|
'systemd-pcrlock-secureboot-policy.service'],
|
||||||
'ENABLE_BOOTLOADER'],
|
'HAVE_TPM2'],
|
||||||
['systemd-pcrphase.service',
|
['systemd-pcrphase.service',
|
||||||
'8',
|
'8',
|
||||||
['systemd-pcrextend',
|
['systemd-pcrextend',
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
||||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||||
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
|
<!-- 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>
|
<refentryinfo>
|
||||||
<title>systemd-measure</title>
|
<title>systemd-measure</title>
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
||||||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
|
||||||
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
|
<!-- 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>
|
<refentryinfo>
|
||||||
<title>systemd-pcrlock</title>
|
<title>systemd-pcrlock</title>
|
||||||
|
|
Loading…
Reference in a new issue