From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 15 Nov 2024 09:34:27 +0000 (+0100)
Subject: Add proper dependencies to ukify target
X-Git-Tag: v256.9~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80462e5dfe6431702e38b627cf5c829f34c4f616;p=thirdparty%2Fsystemd.git

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 1a077e05fbcbfffe548ef39f45e4f2ca1399715d)
---

diff --git a/meson.build b/meson.build
index 5a5ac358cb9..0cb4cfe11f1 100644
--- a/meson.build
+++ b/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