[Buildroot] [git commit] systemd: Replace busybox' binaries only if applicable
Peter Korsgaard
peter at korsgaard.com
Tue Dec 17 16:01:53 UTC 2013
commit: http://git.buildroot.net/buildroot/commit/?id=b1e4bf079d8a4dbde5db72f91a7f654f7dbf0030
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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 <paul at crapouillou.net>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/systemd/systemd.mk | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 4e4955e..a5dc8e5 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 at 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))
More information about the buildroot
mailing list