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

[Arnout Vandecappelle]

On 15/12/2021 23:11, Petr Vorel wrote:
> 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.

  Since iputils will probably not be bumped again before the 2022.02 release, 
and it probably also won't be bumped in the 2022.02.x branch, it makes sense to 
keep them available for the time being. So I've marked this patch as Rejected.

  Regards,
  Arnout

> 
> [1] https://github.com/iputils/iputils/pull/388
> [2] https://github.com/iputils/iputils/issues/363
> 
> Signed-off-by: Petr Vorel <petr.vorel at gmail.com>
> ---
> Changes v1->v2:
> * move options to Config.in.legacy (Fabrice)
> 
>   Config.in.legacy           | 20 ++++++++++++++++++++
>   package/iputils/Config.in  | 23 -----------------------
>   package/iputils/iputils.mk | 10 ++++------
>   3 files changed, 24 insertions(+), 29 deletions(-)
> 
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 3f5ad9132e..38c8afd4a8 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -4395,6 +4395,26 @@ config BR2_TARGET_UBOOT_NETWORK
>   	help
>   	  U-Boot's custom network settings options have been removed.
>   
> +config BR2_PACKAGE_IPUTILS_NINFOD
> +	select BR2_LEGACY
> +	bool "ninfod"
> +	depends on BR2_TOOLCHAIN_HAS_THREADS # ninfod requires <pthread.h>
> +	help
> +	  ninfod has been removed from upstream.
> +
> +config BR2_PACKAGE_IPUTILS_RDISC
> +	bool "rdisc"
> +	select BR2_LEGACY
> +	help
> +	  rdisc has been removed from upstream.
> +
> +config BR2_PACKAGE_IPUTILS_RDISC_SERVER
> +	bool "rdisc (server code)"
> +	select BR2_LEGACY
> +	depends on BR2_PACKAGE_IPUTILS_RDISC
> +	help
> +	  rdisc has been removed from upstream.
> +
>   config BR2_PACKAGE_IPUTILS_TFTPD
>   	bool "tftpd"
>   	select BR2_LEGACY
> 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
>