From: Bastian Krause <bst@pengutronix.de>
Date: Wed, 26 Feb 2025 09:45:03 +0000 (+0100)
Subject: systemd: move sysusers.d systemd-remote to PN-journal-remote
X-Git-Tag: 2025-04-walnascar~391
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d50d3595502e65e3b0997800a6dc60ca3e10100;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

systemd: move sysusers.d systemd-remote to PN-journal-remote

systemd's sysusers.d/systemd-remote.conf contains the user
"systemd-journal-remote" [1]. This file is currently not part of any
specific package.

To make this match the corresponding USERADD_PARAM:${PN}-journal-remote
for the same user, move the file to the correct package.

This prevents warnings in case PACKAGECONFIG contains "microhttpd" but
systemd-journal-remote is not installed, such as:

  WARNING: some-image-1.0-r0 do_rootfs: User systemd-journal-remote has never been defined

[1] https://github.com/systemd/systemd/blob/v257.3/sysusers.d/systemd-remote.conf

Signed-off-by: Bastian Krause <bst@pengutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/systemd/systemd_257.3.bb b/meta/recipes-core/systemd/systemd_257.3.bb
index 03b9c9362a3..324e91e0515 100644
--- a/meta/recipes-core/systemd/systemd_257.3.bb
+++ b/meta/recipes-core/systemd/systemd_257.3.bb
@@ -531,6 +531,7 @@ FILES:${PN}-journal-upload = "${nonarch_libdir}/systemd/systemd-journal-upload \
 SYSTEMD_SERVICE:${PN}-journal-upload = "systemd-journal-upload.service"
 
 FILES:${PN}-journal-remote = "${nonarch_libdir}/systemd/systemd-journal-remote \
+                              ${nonarch_libdir}/sysusers.d/systemd-remote.conf \
                               ${sysconfdir}/systemd/journal-remote.conf \
                               ${systemd_system_unitdir}/systemd-journal-remote.service \
                               ${systemd_system_unitdir}/systemd-journal-remote.socket \