package/busybox: invert dependency with ifplugd

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index b03945ad9c11146b1b67642b89f2929425bb31cb..fb6e02336db463d2d1ed6bd147c9bb2c2c5383e3 100644 (file)
--- 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_IFPLUGD),ifplugd) \
        $(if $(BR2_PACKAGE_IFUPDOWN),ifupdown) \
        $(if $(BR2_PACKAGE_IPROUTE2),iproute2) \
        $(if $(BR2_PACKAGE_IPUTILS),iputils) \

diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index b56932096323cdf71144c0737f67f72853676b3b..c7874b49e5f4af1f295df3d074cee11ad1b2ca57 100644 (file)
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -15,11 +15,6 @@ IFPLUGD_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec
 IFPLUGD_CONF_OPTS = --disable-lynx --with-initdir=/etc/init.d/
 IFPLUGD_DEPENDENCIES = libdaemon
 
-# Prefer big ifplugd
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-IFPLUGD_DEPENDENCIES += busybox
-endif
-
 define IFPLUGD_INSTALL_FIXUP
        $(INSTALL) -D -m 0644 $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
        $(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \