From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 23 Nov 2016 17:54:59 +0000 (+0100)
Subject: Convert all udhcp applets to "new style" applet definitions
X-Git-Tag: 1_26_0~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f7683cdf83f9eb6793b0be34058dcff92e41252d;p=oweals%2Fbusybox.git

Convert all udhcp applets to "new style" applet definitions

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/include/applets.src.h b/include/applets.src.h
index 4e789151d..10e85de78 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -73,15 +73,12 @@ s     - suid type:
 
 
 INSERT
-IF_DHCPRELAY(APPLET(dhcprelay, BB_DIR_USR_SBIN, BB_SUID_DROP))
-IF_DUMPLEASES(APPLET(dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP))
+
 //IF_E2FSCK(APPLET(e2fsck, BB_DIR_SBIN, BB_SUID_DROP))
 //IF_E2LABEL(APPLET_ODDNAME(e2label, tune2fs, BB_DIR_SBIN, BB_SUID_DROP, e2label))
 //IF_E2FSCK(APPLET_ODDNAME(fsck.ext2, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext2))
 //IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext3))
 //IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP))
-IF_UDHCPC(APPLET(udhcpc, BB_DIR_SBIN, BB_SUID_DROP))
-IF_UDHCPD(APPLET(udhcpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
 
 #if !defined(PROTOTYPES) && !defined(NAME_MAIN) && !defined(MAKE_USAGE) \
 	&& !defined(MAKE_LINKS) && !defined(MAKE_SUID)
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 1c1051107..0e236261b 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -18,6 +18,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+//applet:IF_UDHCPC(APPLET(udhcpc, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_UDHCPC) += common.o packet.o signalpipe.o socket.o
+//kbuild:lib-$(CONFIG_UDHCPC) += dhcpc.o
+//kbuild:lib-$(CONFIG_FEATURE_UDHCPC_ARPING) += arpping.o
+//kbuild:lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o
+
 #include <syslog.h>
 /* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */
 #define WANT_PIDFILE 1
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 56116d01f..e116ba3af 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -20,6 +20,11 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+//applet:IF_UDHCPD(APPLET(udhcpd, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_UDHCPD) += common.o packet.o signalpipe.o socket.o
+//kbuild:lib-$(CONFIG_UDHCPD) += dhcpd.o arpping.o
+//kbuild:lib-$(CONFIG_FEATURE_UDHCP_RFC3397) += domain_codec.o
 
 //usage:#define udhcpd_trivial_usage
 //usage:       "[-fS] [-I ADDR]" IF_FEATURE_UDHCP_PORT(" [-P N]") " [CONFFILE]"
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index f52a0cf88..7cb19b14e 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -9,6 +9,9 @@
  *                   Netbeat AG
  * Upstream has GPL v2 or later
  */
+//applet:IF_DHCPRELAY(APPLET(dhcprelay, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_DHCPRELAY) += dhcprelay.o
 
 //usage:#define dhcprelay_trivial_usage
 //usage:       "CLIENT_IFACE[,CLIENT_IFACE2]... SERVER_IFACE [SERVER_IP]"
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 987cc9aff..d83344a8d 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -2,6 +2,9 @@
 /*
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//applet:IF_DUMPLEASES(APPLET(dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_DUMPLEASES) += dumpleases.o
 
 //usage:#define dumpleases_trivial_usage
 //usage:       "[-r|-a] [-d] [-f LEASEFILE]"