From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ptx.hi.pengutronix.de ([2001:6f8:1178:2:5054:ff:fec0:8e10] ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WDVSO-0006eJ-67 for ptxdist@pengutronix.de; Wed, 12 Feb 2014 09:46:12 +0100 Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1WDVSO-0000b1-4a for ptxdist@pengutronix.de; Wed, 12 Feb 2014 09:46:12 +0100 Date: Wed, 12 Feb 2014 09:46:12 +0100 From: Michael Olbrich Message-ID: <20140212084612.GC4551@pengutronix.de> References: <1392018596-11144-1-git-send-email-alex.aring@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1392018596-11144-1-git-send-email-alex.aring@gmail.com> Subject: Re: [ptxdist] [PATCH v2] iputils: fix select statements Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de 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 > --- > 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