From b1e4bf079d8a4dbde5db72f91a7f654f7dbf0030 Mon Sep 17 00:00:00 2001 From: Paul Cercueil Date: Tue, 17 Dec 2013 02:14:54 +0100 Subject: [PATCH] systemd: Replace busybox' binaries only if applicable Previously, the package would overwrite busybox' binaries even if Busybox was set in the config as the default init system. Signed-Off-By: Paul Cercueil Signed-off-by: Peter Korsgaard --- 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 4e4955e2bb..a5dc8e5914 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -54,6 +54,7 @@ endif SYSTEMD_MAKE_OPT += LIBS=-lrt SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl +ifeq ($(BR2_INIT_SYSTEMD),y) define SYSTEMD_INSTALL_INIT_HOOK ln -fs ../usr/lib/systemd/systemd $(TARGET_DIR)/sbin/init ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/halt @@ -62,6 +63,9 @@ define SYSTEMD_INSTALL_INIT_HOOK ln -fs ../../../usr/lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target endef +SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ + SYSTEMD_INSTALL_INIT_HOOK +endif define SYSTEMD_INSTALL_TTY_HOOK rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty@tty1.service @@ -69,7 +73,6 @@ define SYSTEMD_INSTALL_TTY_HOOK endef SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ - SYSTEMD_INSTALL_INIT_HOOK \ SYSTEMD_INSTALL_TTY_HOOK \ $(eval $(autotools-package)) -- 2.30.2