From dad510abd17c7c4a6fdab08d9c71dcf3be3eb1f5 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Fri, 22 Jul 2022 12:16:49 +0200 Subject: [PATCH] package/systemd: allow empty systemd default target 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 [yann.morin.1998@free.fr: - introduce the usual qstripped inter;ediate variable ] Signed-off-by: Yann E. MORIN --- package/systemd/systemd.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 46a4e8de2c..47aaddf849 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -570,17 +570,20 @@ ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) endif +SYSTEMD_DEFAULT_TARGET = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET)) +ifneq ($(SYSTEMD_DEFAULT_TARGET),) define SYSTEMD_INSTALL_INIT_HOOK - ln -fs "$(call qstrip,$(BR2_PACKAGE_SYSTEMD_DEFAULT_TARGET))" \ + ln -fs "$(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