mirror of
https://github.com/systemd/systemd.git
synced 2024-12-21 13:34:21 +03:00
Add proper dependencies to ukify target
Also remove the systemd-measure dependency from the mkosi target as
mkosi doesn't invoke systemd-measure itself.
(cherry picked from commit 1a077e05fb
)
This commit is contained in:
parent
a2240d1cf9
commit
80462e5dfe
11
meson.build
11
meson.build
@ -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',
|
||||
input : 'src/ukify/ukify.py',
|
||||
@ -2643,6 +2651,7 @@ ukify = custom_target(
|
||||
command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
|
||||
install : want_ukify,
|
||||
install_mode : 'rwxr-xr-x',
|
||||
depends : ukify_depends,
|
||||
install_dir : bindir)
|
||||
if want_ukify
|
||||
public_programs += ukify
|
||||
@ -2662,7 +2671,7 @@ endif
|
||||
|
||||
mkosi_depends = public_programs
|
||||
|
||||
foreach executable : ['systemd-journal-remote', 'systemd-measure']
|
||||
foreach executable : ['systemd-journal-remote']
|
||||
if executable in executables_by_name
|
||||
mkosi_depends += [executables_by_name[executable]]
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user