shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-11 20:58:27 +03:00
Code

Add proper dependencies to ukify target

Browse Source 
Also remove the systemd-measure dependency from the mkosi target as
mkosi doesn't invoke systemd-measure itself.

(cherry picked from commit 1a077e05fbcbfffe548ef39f45e4f2ca1399715d)
This commit is contained in:
Daan De Meyer 2024-11-15 10:34:27 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent a2240d1cf9
commit 80462e5dfe
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -2636,6 +2636,14 @@ endif
##################################################################### #####################################################################
ukify_depends = []
foreach executable : ['systemd-measure', 'systemd-sbsign', 'systemd-keyutil']
if executable in executables_by_name
ukify_depends += [executables_by_name[executable]]
endif
endforeach
ukify = custom_target( ukify = custom_target(
'ukify', 'ukify',
input : 'src/ukify/ukify.py', input : 'src/ukify/ukify.py',
@ -2643,6 +2651,7 @@ ukify = custom_target(
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
install : want_ukify, install : want_ukify,
install_mode : 'rwxr-xr-x', install_mode : 'rwxr-xr-x',
depends : ukify_depends,
install_dir : bindir) install_dir : bindir)
if want_ukify if want_ukify
public_programs += ukify public_programs += ukify
@ -2662,7 +2671,7 @@ endif
mkosi_depends = public_programs mkosi_depends = public_programs
foreach executable : ['systemd-journal-remote', 'systemd-measure'] foreach executable : ['systemd-journal-remote']
if executable in executables_by_name if executable in executables_by_name
mkosi_depends += [executables_by_name[executable]] mkosi_depends += [executables_by_name[executable]]
endif endif