From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carlos Santos Date: Tue, 3 Jul 2018 08:30:51 -0300 (BRT) Subject: [Buildroot] [PATCH 21/50] package/busybox: invert dependency with nnamp In-Reply-To: References: Message-ID: <746334206.1185409.1530617451899.JavaMail.zimbra@datacom.com.br> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net > From: "Yann Morin" > To: "buildroot" > Cc: "Yann Morin" > Sent: Monday, July 2, 2018 6:11:55 PM > Subject: [Buildroot] [PATCH 21/50] package/busybox: invert dependency with nnamp nnamp -> nmap > We only need that dependency whan nmap's ncat is enabled. > > For consistency, we add a dependency on nmap, not a suboption of it, > to have a dependency list in busybox that is only about packages, and > directly associates the upper-case package variable to the lower-case > package name, e.g. NMAP <-> nmap. > > Signed-off-by: Yann E. MORIN > --- > package/busybox/busybox.mk | 1 + > package/nmap/nmap.mk | 6 ------ > 2 files changed, 1 insertion(+), 6 deletions(-) > > diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk > index 7f08d857f8..4039d1c9ad 100644 > --- a/package/busybox/busybox.mk > +++ b/package/busybox/busybox.mk > @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ > > # Packages that provide commands that may also be busybox applets: > BUSYBOX_DEPENDENCIES = \ > + $(if $(BR2_PACKAGE_NMAP),nmap) \ > $(if $(BR2_PACKAGE_NTP),ntp) \ > $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ > $(if $(BR2_PACKAGE_PROCPS_NG),procps-ng) \ > diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk > index 1c89b5424e..420aec82d7 100644 > --- a/package/nmap/nmap.mk > +++ b/package/nmap/nmap.mk > @@ -76,12 +76,6 @@ else > NMAP_CONF_OPTS += --without-nping > endif > > -# If we are going to install ncat, ensure Busybox gets built/installed > -# before, so that this package overrides Busybox nc. > -ifeq ($(BR2_PACKAGE_NMAP_NCAT)$(BR2_PACKAGE_BUSYBOX),yy) > -NMAP_DEPENDENCIES += busybox > -endif > - > # Add a symlink to "nc" if none of the competing netcats is selected > ifeq > ($(BR2_PACKAGE_NMAP_NCAT):$(BR2_PACKAGE_NETCAT)$(BR2_PACKAGE_NETCAT_OPENBSD),y:) > define NMAP_INSTALL_NCAT_SYMLINK > -- > 2.14.1 Reviewed-by: Carlos Santos -- Carlos Santos (Casantos) - DATACOM, P&D ?Marched towards the enemy, spear upright, armed with the certainty that only the ignorant can have.? ? Epitaph of a volunteer