diff mbox series

[wrynose,v2,07/10] systemd-tools-native: reduce dependencies, add comments

Message ID 20261105110930.52643-8-jaipaul.cheernam@est.tech
State New
Headers show
Series systemd: Upgrade 259.5 -> 259.10 | expand

Commit Message

Jaipaul Cheernam Nov. 5, 2026, 11:09 a.m. UTC 
From: Ross Burton <ross.burton@arm.com>

Pass "--auto-features disabled" to disable all optional dependencies by
default, and remove build dependencies that are not needed.

Reorganise the recipe to make logical sense and so that the SUMMARY
isn't overwritten by systemd.inc, and add comments.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 717badf77f4a1f72d885f285a7326a485f9938fe)
Note: kept our MESON_TARGET ":executable", -Dpam=disabled and the systemd-sysv-install do_install
Signed-off-by: Jaipaul Cheernam <jaipaul.cheernam@est.tech>
---
 .../systemd/systemd-tools-native_259.5.bb      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-core/systemd/systemd-tools-native_259.5.bb b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb
index 5b29babdc7..89b5220e3e 100644
--- a/meta/recipes-core/systemd/systemd-tools-native_259.5.bb
+++ b/meta/recipes-core/systemd/systemd-tools-native_259.5.bb
@@ -1,16 +1,21 @@ 
 FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:"
 
-SUMMARY = "native tools from systemd"
-
 require systemd.inc
 
-DEPENDS = "gperf-native libcap-native util-linux-native python3-jinja2-native"
+SUMMARY = "native tools from systemd"
+
+# We don't actually need jinja to generate code, but it's checked for at configure time
+DEPENDS = "gperf-native python3-jinja2-native"
 
 inherit pkgconfig meson native
 
-MESON_TARGET = "systemctl:executable"
-MESON_INSTALL_TAGS = "systemctl"
+# Disable everything that is auto-detected by default
+EXTRA_OEMESON += "--auto-features disabled"
+
+# Link systemctl statically
 EXTRA_OEMESON += "-Dlink-systemctl-shared=false"
+
+# Ensure unused build paths are not in the binary
 EXTRA_OEMESON += "-Dsysvinit-path= -Dsysvrcnd-path="
 EXTRA_OEMESON += "-Dpam=disabled"
 
@@ -19,6 +24,9 @@  EXTRA_OEMESON += "-Dpam=disabled"
 # More details are here https://github.com/systemd/systemd/issues/35897#issuecomment-2665405887
 EXTRA_OEMESON += "--sysconfdir ${sysconfdir_native}"
 
+MESON_TARGET = "systemctl:executable"
+MESON_INSTALL_TAGS = "systemctl"
+
 do_install:append() {
 	# Install systemd-sysv-install in /usr/bin rather than /usr/lib/systemd
 	# (where it is normally installed) so systemctl can find it in $PATH.