From ba38a24de3e15cb32450c397cf2eac951e75fb03 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Mon, 13 Dec 2021 09:27:20 -0800 Subject: [PATCH] man: do not install sd-boot man pages when -Dgnu-efi=false is set --- man/bootctl.xml | 2 +- man/loader.conf.xml | 2 +- man/rules/meson.build | 14 +++++++------- man/systemd-bless-boot-generator.xml | 2 +- man/systemd-bless-boot.service.xml | 2 +- man/systemd-boot-system-token.service.xml | 2 +- man/systemd-boot.xml | 2 +- man/systemd-stub.xml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/man/bootctl.xml b/man/bootctl.xml index c50f458bbc7..91dbb3a6e86 100644 --- a/man/bootctl.xml +++ b/man/bootctl.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - bootctl diff --git a/man/loader.conf.xml b/man/loader.conf.xml index 5343751ece1..9fdd1e78d44 100644 --- a/man/loader.conf.xml +++ b/man/loader.conf.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - loader.conf diff --git a/man/rules/meson.build b/man/rules/meson.build index 3efc1880ac8..9513d7e0593 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -5,7 +5,7 @@ # ninja -C build update-man-rules manpages = [ ['binfmt.d', '5', [], 'ENABLE_BINFMT'], - ['bootctl', '1', [], 'ENABLE_EFI'], + ['bootctl', '1', [], 'HAVE_GNU_EFI'], ['bootup', '7', [], ''], ['busctl', '1', [], ''], ['coredump.conf', '5', ['coredump.conf.d'], 'ENABLE_COREDUMP'], @@ -32,7 +32,7 @@ manpages = [ ['kernel-command-line', '7', [], ''], ['kernel-install', '8', [], ''], ['libudev', '3', [], ''], - ['loader.conf', '5', [], 'ENABLE_EFI'], + ['loader.conf', '5', [], 'HAVE_GNU_EFI'], ['locale.conf', '5', [], ''], ['localectl', '1', [], 'ENABLE_LOCALED'], ['localtime', '5', [], ''], @@ -827,14 +827,14 @@ manpages = [ ['systemd-ask-password', '1', [], ''], ['systemd-backlight@.service', '8', ['systemd-backlight'], 'ENABLE_BACKLIGHT'], ['systemd-binfmt.service', '8', ['systemd-binfmt'], 'ENABLE_BINFMT'], - ['systemd-bless-boot-generator', '8', [], 'ENABLE_EFI'], - ['systemd-bless-boot.service', '8', ['systemd-bless-boot'], 'ENABLE_EFI'], + ['systemd-bless-boot-generator', '8', [], 'HAVE_GNU_EFI'], + ['systemd-bless-boot.service', '8', ['systemd-bless-boot'], 'HAVE_GNU_EFI'], ['systemd-boot-check-no-failures.service', '8', ['systemd-boot-check-no-failures'], ''], - ['systemd-boot-system-token.service', '8', [], 'ENABLE_EFI'], - ['systemd-boot', '7', ['sd-boot'], 'ENABLE_EFI'], + ['systemd-boot-system-token.service', '8', [], 'HAVE_GNU_EFI'], + ['systemd-boot', '7', ['sd-boot'], 'HAVE_GNU_EFI'], ['systemd-cat', '1', [], ''], ['systemd-cgls', '1', [], ''], ['systemd-cgtop', '1', [], ''], @@ -968,7 +968,7 @@ manpages = [ ['systemd-stub', '7', ['linuxaa64.efi.stub', 'linuxia32.efi.stub', 'linuxx64.efi.stub'], - 'ENABLE_EFI'], + 'HAVE_GNU_EFI'], ['systemd-suspend.service', '8', ['systemd-hibernate.service', diff --git a/man/systemd-bless-boot-generator.xml b/man/systemd-bless-boot-generator.xml index e945ee8c73c..992e0e90cca 100644 --- a/man/systemd-bless-boot-generator.xml +++ b/man/systemd-bless-boot-generator.xml @@ -3,7 +3,7 @@ - + systemd-bless-boot-generator diff --git a/man/systemd-bless-boot.service.xml b/man/systemd-bless-boot.service.xml index 53d7e4afdc1..53a58b3a1cc 100644 --- a/man/systemd-bless-boot.service.xml +++ b/man/systemd-bless-boot.service.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - diff --git a/man/systemd-boot-system-token.service.xml b/man/systemd-boot-system-token.service.xml index b94665bfca0..f2e30a9b139 100644 --- a/man/systemd-boot-system-token.service.xml +++ b/man/systemd-boot-system-token.service.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - diff --git a/man/systemd-boot.xml b/man/systemd-boot.xml index 3fad947b0d2..ceea368ef24 100644 --- a/man/systemd-boot.xml +++ b/man/systemd-boot.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - systemd-boot diff --git a/man/systemd-stub.xml b/man/systemd-stub.xml index b1983b4927e..6439878951b 100644 --- a/man/systemd-stub.xml +++ b/man/systemd-stub.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> - systemd-stub -- 2.47.3