From 70b6dc763146459ffa3608d93350ef2004b95a2b Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 20 May 2026 17:30:31 +0100
Subject: [PATCH 1/3] meson: reorder core sources array

To hint that sources should be added to the lowest common denominator
first
---
 src/core/meson.build | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/core/meson.build b/src/core/meson.build
index a56df224ab..74871444a3 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -1,5 +1,26 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
+systemd_sources = files(
+        'main.c',
+        'crash-handler.c',
+        'clock-warp.c',
+        'kmod-setup.c',
+        'apparmor-setup.c',
+        'ima-setup.c',
+        'ipe-setup.c',
+        'smack-setup.c',
+        'efi-random.c',
+)
+
+if conf.get('HAVE_SELINUX') == 1
+        systemd_sources += files('selinux-setup.c')
+endif
+
+systemd_executor_sources = files(
+        'executor.c',
+        'exec-invoke.c',
+)
+
 libcore_sources = files(
         'audit-fd.c',
         'automount.c',
@@ -168,27 +189,6 @@ libcore = shared_library(
         install : true,
         install_dir : pkglibdir)
 
-systemd_sources = files(
-        'main.c',
-        'crash-handler.c',
-        'clock-warp.c',
-        'kmod-setup.c',
-        'apparmor-setup.c',
-        'ima-setup.c',
-        'ipe-setup.c',
-        'smack-setup.c',
-        'efi-random.c',
-)
-
-if conf.get('HAVE_SELINUX') == 1
-        systemd_sources += files('selinux-setup.c')
-endif
-
-systemd_executor_sources = files(
-        'executor.c',
-        'exec-invoke.c',
-)
-
 executor_libs = get_option('link-executor-shared') ? \
         [
                 libcore,

From fd16d4ac5426ea3b77f9b176cd8ed5fbd355eac2 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 20 May 2026 17:32:08 +0100
Subject: [PATCH 2/3] meson: reorder core sources alphabetically

---
 src/core/meson.build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/meson.build b/src/core/meson.build
index 74871444a3..83f7ba12f4 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -1,15 +1,15 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 systemd_sources = files(
-        'main.c',
-        'crash-handler.c',
-        'clock-warp.c',
-        'kmod-setup.c',
         'apparmor-setup.c',
+        'clock-warp.c',
+        'crash-handler.c',
+        'efi-random.c',
         'ima-setup.c',
         'ipe-setup.c',
+        'kmod-setup.c',
+        'main.c',
         'smack-setup.c',
-        'efi-random.c',
 )
 
 if conf.get('HAVE_SELINUX') == 1
@@ -24,6 +24,7 @@ systemd_executor_sources = files(
 libcore_sources = files(
         'audit-fd.c',
         'automount.c',
+        'bpf-bind-iface.c',
         'bpf-devices.c',
         'bpf-firewall.c',
         'bpf-foreign.c',
@@ -31,7 +32,6 @@ libcore_sources = files(
         'bpf-restrict-fsaccess.c',
         'bpf-restrict-ifaces.c',
         'bpf-socket-bind.c',
-        'bpf-bind-iface.c',
         'cgroup.c',
         'dbus-automount.c',
         'dbus-cgroup.c',

From e13e69de7c379dd10f5b489b82acbb7a73ec637c Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Wed, 20 May 2026 18:15:52 +0100
Subject: [PATCH 3/3] meson: move one source file from libcore to systemd array

---
 src/core/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/meson.build b/src/core/meson.build
index 83f7ba12f4..e1f315dda6 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -6,6 +6,7 @@ systemd_sources = files(
         'crash-handler.c',
         'efi-random.c',
         'ima-setup.c',
+        'import-creds.c',
         'ipe-setup.c',
         'kmod-setup.c',
         'main.c',
@@ -59,7 +60,6 @@ libcore_sources = files(
         'execute.c',
         'execute-serialize.c',
         'generator-setup.c',
-        'import-creds.c',
         'job.c',
         'kill.c',
         'load-dropin.c',