]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Add proper dependencies to ukify target
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 15 Nov 2024 09:34:27 +0000 (10:34 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Fri, 15 Nov 2024 10:32:24 +0000 (10:32 +0000)
Also remove the systemd-measure dependency from the mkosi target as
mkosi doesn't invoke systemd-measure itself.

meson.build

index ba406f40e391b72fd07accb97196508eff5ea399..d3926106252ec50fcc6eb6e5a10621d1e50d1975 100644 (file)
@@ -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',
         input : 'src/ukify/ukify.py',
@@ -2681,6 +2689,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
@@ -2700,7 +2709,7 @@ endif
 
 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
                 mkosi_depends += [executables_by_name[executable]]
         endif