[ptxdist] [PATCH v2] iputils: fix select statements

[ptxdist] [PATCH v2] iputils: fix select statements

[Alexander Aring]

Iputils builds always all tools with the default env's in Makefile.
We can't disable or enable this during compile time. So we need always
these dependencies.

Also fix add missing dependencies for busybox on menuentries.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
Changes since v2:
 - Add missing busybox dependencies. I thought there was a kind of
   tra`nsitiv dependency but it wasn't.

 rules/iputils.in | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/rules/iputils.in b/rules/iputils.in
index ff8e2b3..07c6ccc 100644
--- a/rules/iputils.in
+++ b/rules/iputils.in
@@ -3,10 +3,10 @@
 menuconfig IPUTILS
 	tristate
 	prompt "iputils                       "
-	select LIBC_RESOLV	if IPUTILS_PING6
-	select LIBCAP		if IPUTILS_ARPING || IPUTILS_PING || IPUTILS_PING6 || IPUTILS_TRACEROUTE6
-	select GNUTLS		if IPUTILS_PING6
-	select GNUTLS_OPENSSL	if IPUTILS_PING6
+	select LIBC_RESOLV
+	select LIBCAP
+	select GNUTLS
+	select GNUTLS_OPENSSL
 	help
 	  The iputils package is set of small useful utilities for Linux
 	  networking.
@@ -33,7 +33,7 @@ config IPUTILS_CLOCKDIFF
 
 config IPUTILS_PING
 	bool
-	depends on !INETUTILS_PING || ALLYES
+	depends on (!BUSYBOX_PING && !INETUTILS_PING) || ALLYES
 	prompt "ping"
 	help
 	  The ping command uses the ICMP protocol's mandatory ECHO_REQUEST datagram
@@ -42,12 +42,15 @@ config IPUTILS_PING
 	  timeval and then an arbitrary number of pad bytes used to fill out
 	  the packet.
 
+comment "inetutils' ping is selected!"
+        depends on INETUTILS_PING
+
 comment "BusyBox' ping is selected!"
         depends on BUSYBOX_PING
 
 config IPUTILS_PING6
 	bool
-	depends on !INETUTILS_PING6 || ALLYES
+	depends on (!BUSYBOX_PING6 && !INETUTILS_PING6) || ALLYES
 	prompt "ping6"
 	depends on GLOBAL_IPV6
 	help
@@ -55,6 +58,9 @@ config IPUTILS_PING6
 	  Information Queries (RFC4620). Intermediate hops may not be allowed,
 	  because IPv6 source routing was deprecated (RFC5095).
 
+comment "inetutils' ping6 is selected!"
+        depends on INETUTILS_PING6
+
 comment "BusyBox' ping6 is selected!"
         depends on BUSYBOX_PING6
 
@@ -78,10 +84,13 @@ config IPUTILS_RDISC
 
 config IPUTILS_TFTPD
 	bool
-	depends on !INETUTILS_TFTPD || ALLYES
+	depends on (!BUSYBOX_TFTPD && !INETUTILS_TFTPD) || ALLYES
 	prompt "tftpd"
 	help
 
+comment "inetutils' tftpd is selected!"
+        depends on INETUTILS_PING
+
 comment "BusyBox' tftpd is selected!"
         depends on BUSYBOX_TFTPD
 
-- 
1.8.5.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] iputils: fix select statements

[Michael Olbrich]

On Mon, Feb 10, 2014 at 08:49:56AM +0100, Alexander Aring wrote:
> Iputils builds always all tools with the default env's in Makefile.
> We can't disable or enable this during compile time. So we need always
> these dependencies.

I solved that differently by not building everything. Please test.

> Also fix add missing dependencies for busybox on menuentries.

I applied this part.

Thanks,
Michael

> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> Changes since v2:
>  - Add missing busybox dependencies. I thought there was a kind of
>    tra`nsitiv dependency but it wasn't.
> 
>  rules/iputils.in | 23 ++++++++++++++++-------
>  1 file changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/rules/iputils.in b/rules/iputils.in
> index ff8e2b3..07c6ccc 100644
> --- a/rules/iputils.in
> +++ b/rules/iputils.in
> @@ -3,10 +3,10 @@
>  menuconfig IPUTILS
>  	tristate
>  	prompt "iputils                       "
> -	select LIBC_RESOLV	if IPUTILS_PING6
> -	select LIBCAP		if IPUTILS_ARPING || IPUTILS_PING || IPUTILS_PING6 || IPUTILS_TRACEROUTE6
> -	select GNUTLS		if IPUTILS_PING6
> -	select GNUTLS_OPENSSL	if IPUTILS_PING6
> +	select LIBC_RESOLV
> +	select LIBCAP
> +	select GNUTLS
> +	select GNUTLS_OPENSSL
>  	help
>  	  The iputils package is set of small useful utilities for Linux
>  	  networking.
> @@ -33,7 +33,7 @@ config IPUTILS_CLOCKDIFF
>  
>  config IPUTILS_PING
>  	bool
> -	depends on !INETUTILS_PING || ALLYES
> +	depends on (!BUSYBOX_PING && !INETUTILS_PING) || ALLYES
>  	prompt "ping"
>  	help
>  	  The ping command uses the ICMP protocol's mandatory ECHO_REQUEST datagram
> @@ -42,12 +42,15 @@ config IPUTILS_PING
>  	  timeval and then an arbitrary number of pad bytes used to fill out
>  	  the packet.
>  
> +comment "inetutils' ping is selected!"
> +        depends on INETUTILS_PING
> +
>  comment "BusyBox' ping is selected!"
>          depends on BUSYBOX_PING
>  
>  config IPUTILS_PING6
>  	bool
> -	depends on !INETUTILS_PING6 || ALLYES
> +	depends on (!BUSYBOX_PING6 && !INETUTILS_PING6) || ALLYES
>  	prompt "ping6"
>  	depends on GLOBAL_IPV6
>  	help
> @@ -55,6 +58,9 @@ config IPUTILS_PING6
>  	  Information Queries (RFC4620). Intermediate hops may not be allowed,
>  	  because IPv6 source routing was deprecated (RFC5095).
>  
> +comment "inetutils' ping6 is selected!"
> +        depends on INETUTILS_PING6
> +
>  comment "BusyBox' ping6 is selected!"
>          depends on BUSYBOX_PING6
>  
> @@ -78,10 +84,13 @@ config IPUTILS_RDISC
>  
>  config IPUTILS_TFTPD
>  	bool
> -	depends on !INETUTILS_TFTPD || ALLYES
> +	depends on (!BUSYBOX_TFTPD && !INETUTILS_TFTPD) || ALLYES
>  	prompt "tftpd"
>  	help
>  
> +comment "inetutils' tftpd is selected!"
> +        depends on INETUTILS_PING
> +
>  comment "BusyBox' tftpd is selected!"
>          depends on BUSYBOX_TFTPD
>  
> -- 
> 1.8.5.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de