mirror of
https://github.com/systemd/systemd
synced 2024-10-07 08:40:44 +00:00
ukify: don't install ukify man page if ukify is not enabled
Checking for gnu-efi is not enough, since ukify can be explicitly disabled. Resolves: #26274
This commit is contained in:
parent
907046282c
commit
9c45bfb2ac
|
@ -1202,7 +1202,7 @@ manpages = [
|
||||||
''],
|
''],
|
||||||
['udev_new', '3', ['udev_ref', 'udev_unref'], ''],
|
['udev_new', '3', ['udev_ref', 'udev_unref'], ''],
|
||||||
['udevadm', '8', [], ''],
|
['udevadm', '8', [], ''],
|
||||||
['ukify', '1', [], 'HAVE_GNU_EFI'],
|
['ukify', '1', [], 'ENABLE_UKIFY'],
|
||||||
['user@.service',
|
['user@.service',
|
||||||
'5',
|
'5',
|
||||||
['systemd-user-runtime-dir', 'user-runtime-dir@.service'],
|
['systemd-user-runtime-dir', 'user-runtime-dir@.service'],
|
||||||
|
|
|
@ -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="ukify" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='HAVE_GNU_EFI'>
|
<refentry id="ukify" xmlns:xi="http://www.w3.org/2001/XInclude" conditional='ENABLE_UKIFY'>
|
||||||
|
|
||||||
<refentryinfo>
|
<refentryinfo>
|
||||||
<title>ukify</title>
|
<title>ukify</title>
|
||||||
|
|
29
meson.build
29
meson.build
|
@ -1940,6 +1940,21 @@ subdir('src/boot/efi')
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
|
pymod = import('python')
|
||||||
|
python = pymod.find_installation('python3', required : true, modules : ['jinja2'])
|
||||||
|
python_39 = python.language_version().version_compare('>=3.9')
|
||||||
|
|
||||||
|
if get_option('ukify') == 'auto'
|
||||||
|
want_ukify = python_39 and conf.get('HAVE_GNU_EFI') == 1
|
||||||
|
elif get_option('ukify') == 'true' and (not python_39 or conf.get('HAVE_GNU_EFI') != 1)
|
||||||
|
error('ukify requires Python >= 3.9 and GNU EFI')
|
||||||
|
else
|
||||||
|
want_ukify = get_option('ukify') == 'true'
|
||||||
|
endif
|
||||||
|
conf.set10('ENABLE_UKIFY', want_ukify)
|
||||||
|
|
||||||
|
############################################################
|
||||||
|
#
|
||||||
generate_gperfs = find_program('tools/generate-gperfs.py')
|
generate_gperfs = find_program('tools/generate-gperfs.py')
|
||||||
make_autosuspend_rules_py = find_program('tools/make-autosuspend-rules.py')
|
make_autosuspend_rules_py = find_program('tools/make-autosuspend-rules.py')
|
||||||
make_directive_index_py = find_program('tools/make-directive-index.py')
|
make_directive_index_py = find_program('tools/make-directive-index.py')
|
||||||
|
@ -1971,20 +1986,6 @@ jinja2_cmdline = [meson_render_jinja2, config_h, version_h]
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
pymod = import('python')
|
|
||||||
python = pymod.find_installation('python3', required : true, modules : ['jinja2'])
|
|
||||||
python_39 = python.language_version().version_compare('>=3.9')
|
|
||||||
|
|
||||||
if get_option('ukify') == 'auto'
|
|
||||||
want_ukify = python_39 and conf.get('HAVE_GNU_EFI') == 1
|
|
||||||
elif get_option('ukify') == 'true' and (not python_39 or conf.get('HAVE_GNU_EFI') != 1)
|
|
||||||
error('ukify requires Python >= 3.9 and GNU EFI')
|
|
||||||
else
|
|
||||||
want_ukify = get_option('ukify') == 'true'
|
|
||||||
endif
|
|
||||||
|
|
||||||
############################################################
|
|
||||||
|
|
||||||
# binaries that have --help and are intended for use by humans,
|
# binaries that have --help and are intended for use by humans,
|
||||||
# usually, but not always, installed in /bin.
|
# usually, but not always, installed in /bin.
|
||||||
public_programs = []
|
public_programs = []
|
||||||
|
|
Loading…
Reference in a new issue