[Buildroot] [PATCH 09/50 v2] package/busybox: invert dependency with tftpd
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Jul 8 09:45:34 UTC 2018
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
package/busybox/busybox.mk | 1 +
package/tftpd/tftpd.mk | 5 -----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 36527ce24e..270dcc1416 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_TFTPD),tftpd) \
$(if $(BR2_PACKAGE_TRACEROUTE),traceroute) \
$(if $(BR2_PACKAGE_UNZIP),unzip) \
$(if $(BR2_PACKAGE_USBUTILS),usbutils) \
diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 78df835aa5..c42456afd1 100644
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -9,11 +9,6 @@ TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
TFTPD_CONF_OPTS = --without-tcpwrappers
-# Override BusyBox implementations if BusyBox is enabled.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-TFTPD_DEPENDENCIES += busybox
-endif
-
define TFTPD_INSTALL_TARGET_CMDS
$(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp
$(INSTALL) -D $(@D)/tftpd/tftpd $(TARGET_DIR)/usr/sbin/tftpd
--
2.14.1
More information about the buildroot
mailing list