From 3dcf299aa42943b22c4313b7b6aed591b47c4cfe Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Apr 2013 20:43:25 +0200 Subject: [PATCH] Makefile*: preparation for systemd but keep using sysv5 for now --- Makefile | 2 +- Makefile.defs | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2e95193..8a45bf0 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ $(MAKEDIST_TARGET)-base: filesystem gzip texinfo ldconfig bash libreadline glibc # splashutils $(MAKEDIST_TARGET)-firmwares: ipw2100-firmware ipw2200-firmware zd1211-firmware radeon-firmware \ rt2501-firmware rt2860-firmware rt2870-firmware r5u87x-firmware -$(MAKEDIST_TARGET)-commontools: sysvinit util-linux module-init-tools \ +$(MAKEDIST_TARGET)-commontools: $(_init_system) util-linux module-init-tools \ procps sed grep net-tools tar bzip2 unzip zip pciutils \ pam shadow-common pwdutils acpid mingetty screen \ net-tools prelink mc dhcpclient timezone nfs-utils \ diff --git a/Makefile.defs b/Makefile.defs index ba2a399..38c9efd 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -3,6 +3,16 @@ # libc libpthread.so.0 = glibc +# systemd/sysvinit +_initsystem = sysvinit +/sbin/halt = $(_initsystem) +/sbin/init = $(_initsystem) +/sbin/poweroff = $(_initsystem) +/sbin/reboot = $(_initsystem) +/sbin/runlevel = $(_initsystem) +/sbin/shutdown = $(_initsystem) +/sbin/telinit = $(_initsystem) + ifeq ($(ARCH),i586) # kernel kernelnvidia = kernel-$(KERNEL_EXTRAVER)-nongpl-nvidia @@ -157,7 +167,6 @@ perl[Automake__XFile] = automake /usr/bin/test = coreutils /sbin/nologin= util-linux /bin/login= util-linux -/sbin/shutdown = sysvinit /usr/bin/chfn= pwdutils /usr/bin/chsh= pwdutils /usr/bin/newgrp= pwdutils