diff mbox series

[2/2] package/iputils: don't build legacy tools

Message ID 20211215184938.21026-2-petr.vorel@gmail.com
State Changes Requested
Headers show
Series [1/2] package/iputils: bump version to 20211215 | expand

Commit Message

Petr Vorel Dec. 15, 2021, 6:49 p.m. UTC 
ninfod, rarpd, rdisc are legacy tools which are going to be removed from
upstream in next release [1], following previous removals [2].
Remove them now from Buildroot.

[1] https://github.com/iputils/iputils/pull/388
[2] https://github.com/iputils/iputils/issues/363

Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
---
 package/iputils/Config.in  | 23 -----------------------
 package/iputils/iputils.mk | 10 ++++------
 2 files changed, 4 insertions(+), 29 deletions(-)
diff mbox series

Patch

diff --git a/package/iputils/Config.in b/package/iputils/Config.in
index 1a8b555570..97870d1745 100644
--- a/package/iputils/Config.in
+++ b/package/iputils/Config.in
@@ -33,33 +33,10 @@  config BR2_PACKAGE_IPUTILS_RARPD
 	help
 	  Installs rarpd.
 
-config BR2_PACKAGE_IPUTILS_RDISC
-	bool "rdisc"
-	default y
-	help
-	  Installs rdisc.
-
-config BR2_PACKAGE_IPUTILS_RDISC_SERVER
-	bool "rdisc (server code)"
-	default y
-	depends on BR2_PACKAGE_IPUTILS_RDISC
-	help
-	  Builds rdisc with server code.
-
 config BR2_PACKAGE_IPUTILS_TRACEPATH
 	bool "tracepath"
 	default y
 	help
 	  Installs tracepath.
 
-config BR2_PACKAGE_IPUTILS_NINFOD
-	bool "ninfod"
-	default y
-	depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires <pthread.h>
-	help
-	  Installs ninfod.
-
-comment "ninfod needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
 endif
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 84059de330..6420720eff 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -21,19 +21,17 @@  IPUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 # Selectively build binaries
 IPUTILS_CONF_OPTS += \
 	-DBUILD_CLOCKDIFF=$(if $(BR2_PACKAGE_IPUTILS_CLOCKDIFF),true,false) \
-	-DBUILD_RARPD=$(if $(BR2_PACKAGE_IPUTILS_RARPD),true,false) \
-	-DBUILD_RDISC=$(if $(BR2_PACKAGE_IPUTILS_RDISC),true,false) \
-	-DENABLE_RDISC_SERVER=$(if $(BR2_PACKAGE_IPUTILS_RDISC_SERVER),true,false) \
+	-DBUILD_NINFOD=false \
+	-DBUILD_RARPD=false \
+	-DBUILD_RDISC=false \
 	-DBUILD_TRACEPATH=$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),true,false) \
-	-DBUILD_NINFOD=$(if $(BR2_PACKAGE_IPUTILS_NINFOD),true,false) \
 	-DSKIP_TESTS=true
 
 # Selectively select the appropriate SELinux refpolicy modules
 IPUTILS_SELINUX_MODULES = \
 	$(if $(BR2_PACKAGE_IPUTILS_ARPING),netutils) \
 	$(if $(BR2_PACKAGE_IPUTILS_PING),netutils) \
-	$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils) \
-	$(if $(BR2_PACKAGE_IPUTILS_RDISC),rdisc)
+	$(if $(BR2_PACKAGE_IPUTILS_TRACEPATH),netutils)
 
 #
 # arping