diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-04-19 09:40:00 -0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-04-22 23:06:35 +0200 |
| commit | 79ce08bbdc33d1725f5d950736c9f624814b5a03 (patch) | |
| tree | 1b3aaff6114959b7bad2234504ddfb31af0735f3 /package/iputils | |
| parent | 55bab4f619833b4edf933a7309503c9425cf623d (diff) | |
| download | buildroot-79ce08bbdc33d1725f5d950736c9f624814b5a03.tar.gz buildroot-79ce08bbdc33d1725f5d950736c9f624814b5a03.zip | |
packages: remove non-IPv6 dependencies and tweaks
Now that IPv6 is mandatory remove package dependencies and conditionals
for it.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/iputils')
| -rw-r--r-- | package/iputils/Config.in | 2 | ||||
| -rw-r--r-- | package/iputils/iputils.mk | 21 |
2 files changed, 7 insertions, 16 deletions
diff --git a/package/iputils/Config.in b/package/iputils/Config.in index fdddb52d24..5324639573 100644 --- a/package/iputils/Config.in +++ b/package/iputils/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_IPUTILS bool "iputils" - select BR2_PACKAGE_OPENSSL if BR2_INET_IPV6 + select BR2_PACKAGE_OPENSSL depends on BR2_USE_MMU # fork() help This package is set of small useful utilities for Linux networking. diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 735ed65e7c..332e20f15c 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -10,6 +10,7 @@ IPUTILS_SOURCE = iputils-$(IPUTILS_VERSION).tar.bz2 IPUTILS_LICENSE = GPLv2+ BSD-3c # Only includes a license file for BSD IPUTILS_LICENSE_FILES = ninfod/COPYING +IPUTILS_DEPENDENCIES = openssl # Build after busybox so target ends up with this package's full # versions of the applications instead of busybox applets. @@ -20,20 +21,8 @@ endif # Disabling CAP_SETPCAP (file capabilities) IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\ CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - arping clockdiff ping rarpd rdisc tftpd tracepath - -ifeq ($(BR2_INET_IPV6),y) -# To support md5 for ping6 -IPUTILS_DEPENDENCIES += openssl - -IPUTILS_MAKE_OPTS += ping6 tracepath6 traceroute6 - -define IPUTILS_IPV6_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6 - $(INSTALL) -D -m 755 $(@D)/tracepath6 $(TARGET_DIR)/bin/tracepath6 - $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 -endef -endif + arping clockdiff ping rarpd rdisc tftpd tracepath \ + ping6 tracepath6 traceroute6 define IPUTILS_BUILD_CMDS $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) @@ -47,7 +36,9 @@ define IPUTILS_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(@D)/rdisc $(TARGET_DIR)/sbin/rdisc $(INSTALL) -D -m 755 $(@D)/tftpd $(TARGET_DIR)/usr/sbin/in.tftpd $(INSTALL) -D -m 755 $(@D)/tracepath $(TARGET_DIR)/bin/tracepath - $(IPUTILS_IPV6_INSTALL_TARGET_CMDS) + $(INSTALL) -D -m 755 $(@D)/ping6 $(TARGET_DIR)/bin/ping6 + $(INSTALL) -D -m 755 $(@D)/tracepath6 $(TARGET_DIR)/bin/tracepath6 + $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 endef $(eval $(generic-package)) |
