From 9f9235d35c7bce5cc7ca87b8cb1c6c92a0b2c15c Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 8 Jul 2018 11:45:46 +0200 Subject: [PATCH] package/busybox: invert dependency with nmap We only need that dependency when 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. Thus, if BR2_PACKAGE_NMAP_NCAT is selected, we have a redundant dependency. But that doesn't hurt and it really simplifies things. Signed-off-by: Yann E. MORIN Reviewed-by: Carlos Santos Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 1d3d202f53..55c3d25b8e 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