[ptxdist] [PATCH v2] rauc: optional rauc-mark-good.service installation

[ptxdist] [PATCH v2] rauc: optional rauc-mark-good.service installation

[r.czerwinski]

From: Rouven Czerwinski <r.czerwinski@pengutronix.de>

Make the installation and enablement of the rauc-mark-good.service
optional. This is useful for BSPs which have the application indicate if
startup was successful instead of indicating successful startup using the
rauc-mark-good-service.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
v2:
- fix typos
- properly name service in KConfig entry
 rules/rauc.in   | 10 ++++++++++
 rules/rauc.make |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/rules/rauc.in b/rules/rauc.in
index ee9c3f955..68fa59b31 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -46,6 +46,16 @@ config RAUC_SERVICE
 	  that communicate with each other via D-Bus interface.
 	  Only deactivate this if you have a system that does not provide D-Bus!
 
+config RAUC_MARK_GOOD
+	bool
+	prompt "Enable systemd rauc-mark-good.service"
+	default y
+	help
+	  Installs and enables the default rauc-mark-good.service shipped with rauc.
+	  The rauc-mark-good.service runs when the systemd has successfully started
+	  up, which is not desirable if the application indicates the succesful
+	  startup.
+
 config RAUC_NETWORK
 	bool
 	prompt "Enable network support"
diff --git a/rules/rauc.make b/rules/rauc.make
index 38577f94d..7aed77e89 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -95,10 +95,12 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
 	@$(call install_alternative, rauc, 0, 0, 0644, \
 		/usr/lib/systemd/system/rauc.service)
 
+ifdef PTXCONF_RAUC_MARK_GOOD
 	@$(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)
+endif
 else
 	@$(call install_copy, rauc, 0, 0, 0755, -, \
 		/usr/libexec/rauc-service.sh)
-- 
2.44.1

Re: [ptxdist] [PATCH v2] rauc: optional rauc-mark-good.service installation

[Michael Olbrich]

On Tue, May 28, 2024 at 04:55:46PM +0200, r.czerwinski@pengutronix.de wrote:
> From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> 
> Make the installation and enablement of the rauc-mark-good.service
> optional. This is useful for BSPs which have the application indicate if
> startup was successful instead of indicating successful startup using the
> rauc-mark-good-service.
> 
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
> v2:
> - fix typos
> - properly name service in KConfig entry
>  rules/rauc.in   | 10 ++++++++++
>  rules/rauc.make |  2 ++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/rules/rauc.in b/rules/rauc.in
> index ee9c3f955..68fa59b31 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -46,6 +46,16 @@ config RAUC_SERVICE
>  	  that communicate with each other via D-Bus interface.
>  	  Only deactivate this if you have a system that does not provide D-Bus!
>  
> +config RAUC_MARK_GOOD
> +	bool

As I said before:

	depends on INITMETHOD_SYSTEMD

This option only makes sense when systemd is used.

Michael

> +	prompt "Enable systemd rauc-mark-good.service"
> +	default y
> +	help
> +	  Installs and enables the default rauc-mark-good.service shipped with rauc.
> +	  The rauc-mark-good.service runs when the systemd has successfully started
> +	  up, which is not desirable if the application indicates the succesful
> +	  startup.
> +
>  config RAUC_NETWORK
>  	bool
>  	prompt "Enable network support"
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 38577f94d..7aed77e89 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -95,10 +95,12 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
>  	@$(call install_alternative, rauc, 0, 0, 0644, \
>  		/usr/lib/systemd/system/rauc.service)
>  
> +ifdef PTXCONF_RAUC_MARK_GOOD
>  	@$(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)
> +endif
>  else
>  	@$(call install_copy, rauc, 0, 0, 0755, -, \
>  		/usr/libexec/rauc-service.sh)
> -- 
> 2.44.1
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |