[ptxdist] [PATCH] systemd: install systemd-journal-upload

[ptxdist] [PATCH] systemd: install systemd-journal-upload

[Michael Tretter]

systemd-journal-upload allows to send journal messages over the network.
As it is enabled together with systemd-journal-remote and build if
libcurl is available, it is already build together with
systemd-journal-remote.

Install systemd-journal-upload and the config file into the target
system.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 rules/systemd.make | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rules/systemd.make b/rules/systemd.make
index ae0564213a2d..bed45a2c8d52 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -269,6 +269,7 @@ SYSTEMD_HELPER := \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_HOSTNAMED,systemd-hostnamed) \
 	systemd-journald \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote) \
+	$(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-upload) \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed) \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-logind) \
 	$(call ptx/ifdef, PTXCONF_SYSTEMD_NSPAWN,systemd-machined) \
@@ -457,6 +458,8 @@ endif
 ifdef PTXCONF_SYSTEMD_JOURNAL_REMOTE
 	@$(call install_alternative, systemd, 0, 0, 0644, \
 		/etc/systemd/journal-remote.conf)
+	@$(call install_alternative, systemd, 0, 0, 0644, \
+		/etc/systemd/journal-upload.conf)
 endif
 
 ifdef PTXCONF_SYSTEMD_LOCALES
-- 
2.39.5

Re: [ptxdist] [APPLIED] systemd: install systemd-journal-upload

[Michael Olbrich]

Thanks, applied as 397fb3a7be2bb6f5dd48482890d8f35b96ad0732.

Michael

[sent from post-receive hook]

On Fri, 10 Jan 2025 08:44:53 +0100, Michael Tretter <m.tretter@pengutronix.de> wrote:
> systemd-journal-upload allows to send journal messages over the network.
> As it is enabled together with systemd-journal-remote and build if
> libcurl is available, it is already build together with
> systemd-journal-remote.
> 
> Install systemd-journal-upload and the config file into the target
> system.
> 
> Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
> Message-Id: <20241209110213.1391568-1-m.tretter@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/systemd.make b/rules/systemd.make
> index ae0564213a2d..bed45a2c8d52 100644
> --- a/rules/systemd.make
> +++ b/rules/systemd.make
> @@ -269,6 +269,7 @@ SYSTEMD_HELPER := \
>  	$(call ptx/ifdef, PTXCONF_SYSTEMD_HOSTNAMED,systemd-hostnamed) \
>  	systemd-journald \
>  	$(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote) \
> +	$(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-upload) \
>  	$(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed) \
>  	$(call ptx/ifdef, PTXCONF_SYSTEMD_LOGIND,systemd-logind) \
>  	$(call ptx/ifdef, PTXCONF_SYSTEMD_NSPAWN,systemd-machined) \
> @@ -457,6 +458,8 @@ endif
>  ifdef PTXCONF_SYSTEMD_JOURNAL_REMOTE
>  	@$(call install_alternative, systemd, 0, 0, 0644, \
>  		/etc/systemd/journal-remote.conf)
> +	@$(call install_alternative, systemd, 0, 0, 0644, \
> +		/etc/systemd/journal-upload.conf)
>  endif
>  
>  ifdef PTXCONF_SYSTEMD_LOCALES