diff mbox series

[v4,2/4] package/systemd: allow empty systemd default target

Message ID 20220722101653.7475-2-nolange79@gmail.com
State Accepted
Headers show
Series [v4,1/4] package/systemd: bump to version 251.3 | expand

Commit Message

Norbert Lange July 22, 2022, 10:16 a.m. UTC 
Currently, we forcefully require that a default target be specified.
However, systemd does install a default target, but it's not
possible to just use that target.

Allow the user to blank-out the config setting to not override
whatever systemd installed and keep that.

Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
v1->v2:

*   completely remove the hook if var is empty
*   adjusted commit message

v2->v3:

*   v2 was broken, dint want to send it. now fixed/correct

Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
 package/systemd/systemd.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Yann E. MORIN July 23, 2022, 4:47 p.m. UTC | #1 
Norbert, All,

On 2022-07-22 12:16 +0200, Norbert Lange spake thusly:
> Currently, we forcefully require that a default target be specified.
> However, systemd does install a default target, but it's not
> possible to just use that target.
> 
> Allow the user to blank-out the config setting to not override
> whatever systemd installed and keep that.
> 
> Signed-off-by: Norbert Lange <nolange79@gmail.com>
> ---
>  package/systemd/systemd.mk | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> index b5628f5155..bacde5221b 100644
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -583,17 +583,20 @@ ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),)
>  SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME)
>  endif
>  
> +ifneq ($(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET)),)

As I suggested in my previous review, we traditionally introduce an
intermediate variable that holds the qstrip-ed value, and this is also
already used a few times in systemd.mk, so I did the same here.

Applied to master with the above change, thanks.

Regards,
Yann E. MORIN.

>  define SYSTEMD_INSTALL_INIT_HOOK
>  	ln -fs "$(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET))" \
>  		$(TARGET_DIR)/usr/lib/systemd/system/default.target
>  endef
>  
> +SYSTEMD_POST_INSTALL_TARGET_HOOKS += SYSTEMD_INSTALL_INIT_HOOK
> +endif
> +
>  define SYSTEMD_INSTALL_MACHINEID_HOOK
>  	touch $(TARGET_DIR)/etc/machine-id
>  endef
>  
>  SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
> -	SYSTEMD_INSTALL_INIT_HOOK \
>  	SYSTEMD_INSTALL_MACHINEID_HOOK
>  
>  define SYSTEMD_INSTALL_IMAGES_CMDS
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index b5628f5155..bacde5221b 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -583,17 +583,20 @@  ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),)
 SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME)
 endif
 
+ifneq ($(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET)),)
 define SYSTEMD_INSTALL_INIT_HOOK
 	ln -fs "$(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET))" \
 		$(TARGET_DIR)/usr/lib/systemd/system/default.target
 endef
 
+SYSTEMD_POST_INSTALL_TARGET_HOOKS += SYSTEMD_INSTALL_INIT_HOOK
+endif
+
 define SYSTEMD_INSTALL_MACHINEID_HOOK
 	touch $(TARGET_DIR)/etc/machine-id
 endef
 
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
-	SYSTEMD_INSTALL_INIT_HOOK \
 	SYSTEMD_INSTALL_MACHINEID_HOOK
 
 define SYSTEMD_INSTALL_IMAGES_CMDS