deepcrayon
/
buildroot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <yann.morin.1998@free.fr>
Reviewed-by: Carlos Santos <casantos@datacom.com.br>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2018.08.x
Yann E. MORIN 2018-07-08 11:45:46 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent 2319270de7
commit 9f9235d35c
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/busybox/busybox.mk
View File

@ -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) \

6
package/nmap/nmap.mk
View File

@ -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