From 9c45bfb2ac10b343cd27aa30f8f37f4d476d92ca Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Tue, 31 Jan 2023 21:43:53 +0100 Subject: [PATCH] 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 --- man/rules/meson.build | 2 +- man/ukify.xml | 2 +- meson.build | 29 +++++++++++++++-------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/man/rules/meson.build b/man/rules/meson.build index 194cc0b904c..75197736b0f 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build @@ -1202,7 +1202,7 @@ manpages = [ ''], ['udev_new', '3', ['udev_ref', 'udev_unref'], ''], ['udevadm', '8', [], ''], - ['ukify', '1', [], 'HAVE_GNU_EFI'], + ['ukify', '1', [], 'ENABLE_UKIFY'], ['user@.service', '5', ['systemd-user-runtime-dir', 'user-runtime-dir@.service'], diff --git a/man/ukify.xml b/man/ukify.xml index c5bf91de02e..a6818cca0f5 100644 --- a/man/ukify.xml +++ b/man/ukify.xml @@ -3,7 +3,7 @@ - + ukify diff --git a/meson.build b/meson.build index 2ca63372bfe..71ebe6716ff 100644 --- a/meson.build +++ b/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') make_autosuspend_rules_py = find_program('tools/make-autosuspend-rules.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, # usually, but not always, installed in /bin. public_programs = []