f7683cdf8
Denys Vlasenko
2016-11-23
Subject
Convert all udhcp applets to "new style" applet definitions
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
include/applets.src.h +1 -4networking/udhcp/dhcpc.c +7 -0networking/udhcp/dhcpd.c +5 -0networking/udhcp/dhcprelay.c +3 -0networking/udhcp/dumpleases.c +3 -0
include/applets.src.h+1 -4
| @@ -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) | |
networking/udhcp/dhcpc.c+7 -0
| @@ -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 | |
networking/udhcp/dhcpd.c+5 -0
| @@ -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]" | |
networking/udhcp/dhcprelay.c+3 -0
| @@ -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]" | |
networking/udhcp/dumpleases.c+3 -0
| @@ -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]" | |