From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 21 Sep 2023 15:48:05 +0000 (+0000)
Subject: systemd: Link against whatever systemd supports
X-Git-Url: http://git.ipfire.org/?p=ipfire-3.x.git;a=commitdiff_plain;h=fdc5bfe81fb555778895950a4003cef0ebb6a90e

systemd: Link against whatever systemd supports

We have some libraries which systemd can take advantage of which have
formerly not been enabled.

This patch also fixes running the testsuite which - however - currently
does not run through.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 984a1c026..bdb1e3f04 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 254
-release    = 2
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -50,16 +50,25 @@ build
 		kbd
 		kmod-devel >= 15
 		libacl-devel
+		libbpf-devel
 		libblkid-devel
 		libcap-devel
+		libcurl-devel
+		libfdisk-devel
 		libgcrypt-devel
+		libidn-devel
+		libidn2-devel
 		libmount-devel >= 2.34-2
+		libpwquality-devel
 		libseccomp-devel
 		libuuid-devel >= 2.34-2
 		libxcrypt-devel
+		lz4-devel
 		m4
 		meson >= 0.50.1
 		ninja >= 1.9.0
+		openssl-devel
+		p11-kit-devel
 		pam-devel
 		pciutils-devel
 		python3-devel
@@ -130,8 +139,7 @@ build
 		touch %{sysconfdir}/machine-id
 
 		# Run the testsuite.
-		ninja test -v %{PARALLELISMFLAGS} -C build || true
-
+		%{meson_test} || true
 	end
 
 	install