[Buildroot] [PATCH 11/50 v2] package/busybox: invert dependency with sysvinit
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Jul 8 09:45:36 UTC 2018
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
Reviewed-by: Carlos Santos <casantos at datacom.com.br>
---
package/busybox/busybox.mk | 1 +
package/sysvinit/sysvinit.mk | 5 -----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index ff2e4c770c..e504924540 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
# Packages that provide commands that may also be busybox applets:
BUSYBOX_DEPENDENCIES = \
+ $(if $(BR2_PACKAGE_SYSVINIT),sysvinit) \
$(if $(BR2_PACKAGE_TAR),tar) \
$(if $(BR2_PACKAGE_TFTPD),tftpd) \
$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk
index a606ddabf0..993e399e73 100644
--- a/package/sysvinit/sysvinit.mk
+++ b/package/sysvinit/sysvinit.mk
@@ -13,11 +13,6 @@ SYSVINIT_LICENSE_FILES = COPYING
SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR)
-# Override BusyBox implementations if BusyBox is enabled.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-SYSVINIT_DEPENDENCIES = busybox
-endif
-
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
SYSVINIT_DEPENDENCIES += libselinux
SYSVINIT_MAKE_OPTS += WITH_SELINUX="yes"
--
2.14.1
More information about the buildroot
mailing list