arp/rarp: add a config knob to control them

multipath-tcp · Feb 15, 2016 · fbc11bb · fbc11bb
1 parent 2cc98e1
commit fbc11bb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -33,9 +33,12 @@ SBINDIR ?= /sbin
 NET_LIB_PATH = lib
 NET_LIB_NAME = net-tools
 
-PROGS	:= ifconfig hostname arp netstat route rarp slattach plipconfig nameif
+PROGS	:= ifconfig hostname netstat route slattach plipconfig nameif
 
 -include config.make
+ifeq ($(HAVE_ARP_TOOLS),1)
+PROGS	+= arp rarp
+endif
 ifeq ($(HAVE_IP_TOOLS),1)
 PROGS   += iptunnel ipmaddr
 endif
@@ -201,15 +204,17 @@ installbin:
 	@echo
 	install -m 0755 -d ${BASEDIR}${SBINDIR}
 	install -m 0755 -d ${BASEDIR}${BINDIR}
-	install -m 0755 arp        ${BASEDIR}${SBINDIR}
 	install -m 0755 hostname   ${BASEDIR}${BINDIR}
 	install -m 0755 ifconfig   ${BASEDIR}${BINDIR}
 	install -m 0755 nameif     ${BASEDIR}${SBINDIR}
 	install -m 0755 netstat    ${BASEDIR}${BINDIR}
 	install -m 0755 plipconfig $(BASEDIR)${SBINDIR}
-	install -m 0755 rarp       ${BASEDIR}${SBINDIR}
 	install -m 0755 route      ${BASEDIR}${BINDIR}
 	install -m 0755 slattach   $(BASEDIR)${SBINDIR}
+ifeq ($(HAVE_ARP_TOOLS),1)
+	install -m 0755 arp        ${BASEDIR}${SBINDIR}
+	install -m 0755 rarp       ${BASEDIR}${SBINDIR}
+endif
 ifeq ($(HAVE_IP_TOOLS),1)
 	install -m 0755 ipmaddr    $(BASEDIR)${SBINDIR}
 	install -m 0755 iptunnel   $(BASEDIR)${SBINDIR}

diff --git a/config.in b/config.in
@@ -90,6 +90,7 @@ bool 'InfiniBand hardware support' HAVE_HWIB y
 *           Other Features.
 *
 bool 'IP Masquerading support' HAVE_FW_MASQUERADE y
+bool 'Build arp and rarp' HAVE_ARP_TOOLS y
 bool 'Build iptunnel and ipmaddr' HAVE_IP_TOOLS y
 bool 'Build mii-tool' HAVE_MII y
 bool 'SELinux support' HAVE_SELINUX n
diff --git a/man/Makefile b/man/Makefile
@@ -40,6 +40,9 @@ LANGS = en_US
 endif
 
 IGNORE_CMDS = ""
+ifneq ($(HAVE_ARP_TOOLS),1)
+IGNORE_CMDS += |arp.?|rarp.?
+endif
 ifneq ($(HAVE_IP_TOOLS),1)
 IGNORE_CMDS += |ipmaddr.?|iptunnel.?
 endif