ifplugd: misc fixes

* Busybox provides ifplugd, so build after it and make the menu option
  conditional on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
* Style cleanup

[Peter: really make it depend on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/Config.in b/package/Config.in
index 30a9dcb39ae87cdabb732e0dd800cc2b4bf29049..5a378da9b60969141bf4fa0252ef8b47f33c4d14 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -417,7 +417,9 @@ source "package/dropbear/Config.in"
 source "package/ebtables/Config.in"
 source "package/ethtool/Config.in"
 source "package/hostapd/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/ifplugd/Config.in"
+endif
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"

diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 33c4367ee697b99954fdfe6b8659e239e50b7640..cb06b634890a714ed8ba382b5be6fec26e2d69d4 100644 (file)
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -3,19 +3,20 @@
 # ifplugd
 #
 #############################################################
+
 IFPLUGD_VERSION = 0.28
-IFPLUGD_SOURCE = ifplugd-$(IFPLUGD_VERSION).tar.gz
-IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd/
+IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd
 IFPLUGD_AUTORECONF = YES
-IFPLUGD_INSTALL_STAGING = NO
-IFPLUGD_INSTALL_TARGET = YES
 # install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.*
 IFPLUGD_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec
-
 IFPLUGD_CONF_OPT = --disable-lynx
-
 IFPLUGD_DEPENDENCIES = libdaemon
 
+# Prefer big ifplugd
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+       IFPLUGD_DEPENDENCIES += busybox
+endif
+
 define IFPLUGD_INSTALL_FIXUP
        $(INSTALL) -d $(TARGET_DIR)/etc/ifplugd
        @if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \