From 1a077e05fbcbfffe548ef39f45e4f2ca1399715d Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 15 Nov 2024 10:34:27 +0100
Subject: [PATCH] Add proper dependencies to ukify target

Also remove the systemd-measure dependency from the mkosi target as
mkosi doesn't invoke systemd-measure itself.
---
 meson.build | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index ba406f40e39..d3926106252 100644
--- a/meson.build
+++ b/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',
         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