[ptxdist] [PATCH] rauc: install service startscripts only when needed

[ptxdist] [PATCH] rauc: install service startscripts only when needed

[Andreas Helmcke]

rauc service is only needed with D-bus, so do not install startup scripts if PTXCONF_RAUC_SERVICE is unset

Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
---
 rules/rauc.make | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/rules/rauc.make b/rules/rauc.make
index 0f71f12ed..f2bbcbe05 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -85,19 +85,20 @@ ifdef PTXCONF_RAUC_SERVICE
 		/usr/share/dbus-1/system-services/de.pengutronix.rauc.service)
 	@$(call install_copy, rauc, 0, 0, 0644, -, \
 		/usr/share/dbus-1/system.d/de.pengutronix.rauc.conf)
-endif
 
-ifdef PTXCONF_INITMETHOD_SYSTEMD
-	@$(call install_alternative, rauc, 0, 0, 0644, \
-		/usr/lib/systemd/system/rauc.service)
-
-	@$(call install_alternative, rauc, 0, 0, 0644, \
-		/usr/lib/systemd/system/rauc-mark-good.service)
-	@$(call install_link, rauc, ../rauc-mark-good.service, \
-		/usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service)
-else
-	@$(call install_copy, rauc, 0, 0, 0755, -, \
-		/usr/libexec/rauc-service.sh)
+	ifdef PTXCONF_INITMETHOD_SYSTEMD
+		@$(call install_alternative, rauc, 0, 0, 0644, \
+			/usr/lib/systemd/system/rauc.service)
+
+		@$(call install_alternative, rauc, 0, 0, 0644, \
+			/usr/lib/systemd/system/rauc-mark-good.service)
+		@$(call install_link, rauc, ../rauc-mark-good.service, \
+			/usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service)
+	else
+		@$(call install_copy, rauc, 0, 0, 0755, -, \
+			/usr/libexec/rauc-service.sh)
+	endif
+
 endif
 
 	@$(call install_finish, rauc)
-- 
2.39.2

Re: [ptxdist] [APPLIED] rauc: install service startscripts only when needed

[Michael Olbrich]

Thanks, applied as 9889ee318ee5fc10e4086365f4b751a96d4b9ff2.

Michael

[sent from post-receive hook]

On Fri, 17 Nov 2023 08:20:30 +0100, Andreas Helmcke <ahelmcke@ela-soft.com> wrote:
> rauc service is only needed with D-bus, so do not install startup scripts if PTXCONF_RAUC_SERVICE is unset
> 
> Signed-off-by: Andreas Helmcke <ahelmcke@ela-soft.com>
> Message-Id: <20231012152039.85251-1-ahelmcke@ela-soft.com>
> [mol: no extra indention]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 0f71f12edef0..64839f978b01 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -85,7 +85,6 @@ ifdef PTXCONF_RAUC_SERVICE
>  		/usr/share/dbus-1/system-services/de.pengutronix.rauc.service)
>  	@$(call install_copy, rauc, 0, 0, 0644, -, \
>  		/usr/share/dbus-1/system.d/de.pengutronix.rauc.conf)
> -endif
>  
>  ifdef PTXCONF_INITMETHOD_SYSTEMD
>  	@$(call install_alternative, rauc, 0, 0, 0644, \
> @@ -98,6 +97,7 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
>  else
>  	@$(call install_copy, rauc, 0, 0, 0755, -, \
>  		/usr/libexec/rauc-service.sh)
> +endif
>  endif
>  
>  	@$(call install_finish, rauc)