mirror of
https://github.com/systemd/systemd.git
synced 2024-11-23 02:03:37 +08: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.
This commit is contained in:
parent
9386bcc2da
commit
1a077e05fb
11
meson.build
11
meson.build
@ -2674,6 +2674,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',
|
||||||
@ -2681,6 +2689,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
|
||||||
@ -2700,7 +2709,7 @@ endif
|
|||||||
|
|
||||||
mkosi_depends = public_programs
|
mkosi_depends = public_programs
|
||||||
|
|
||||||
foreach executable : ['systemd-journal-remote', 'systemd-measure', 'systemd-sbsign', 'systemd-keyutil']
|
foreach executable : ['systemd-journal-remote', 'systemd-sbsign', 'systemd-keyutil']
|
||||||
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
|
||||||
|
Loading…
Reference in New Issue
Block a user