aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2019-01-11 16:15:57 +0100
committerHans Dedecker <dedeckeh@gmail.com>2019-01-13 18:27:28 +0100
commit3f0eb71daeec1d329e3ce5d53a9f5a35b1fed3ee (patch)
tree83b1a7dd714b91f8bf591726ee786f7fee36d6ce
parentd560deb7f2240d51027f9296d5dd549e51cd093f (diff)
downloadupstream-3f0eb71daeec1d329e3ce5d53a9f5a35b1fed3ee.tar.gz
upstream-3f0eb71daeec1d329e3ce5d53a9f5a35b1fed3ee.tar.bz2
upstream-3f0eb71daeec1d329e3ce5d53a9f5a35b1fed3ee.zip
busybox: add ALTERNATIVES for wget
Busybox wget applet conflicts with the version from uclient. Fix this by using ALTERNATIVE support for wget in busybox. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/utils/busybox/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 80e8846a56..82f33d131f 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -60,6 +60,7 @@ define Package/busybox
$(call BUSYBOX_IF_ENABLED,UPTIME, 100:/usr/bin/uptime:/bin/busybox) \
$(call BUSYBOX_IF_ENABLED,WATCH, 100:/bin/watch:/bin/busybox) \
$(call BUSYBOX_IF_ENABLED,XARGS, 100:/usr/bin/xargs:/bin/busybox) \
+ $(call BUSYBOX_IF_ENABLED,WGET, 100:/usr/bin/wget:/bin/busybox) \
endef