aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/busybox
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2018-10-07 20:37:47 +0200
committerHans Dedecker <dedeckeh@gmail.com>2018-10-07 20:46:51 +0200
commitec9576607d19ddda04334142bdd7feef8cb5c5ca (patch)
treea7dd1e90e7d76a811355b48c8f27da0a8a707e70 /package/utils/busybox
parent30cc5b0bf4f3cdfe950ca7fc380a34c81dd9d7e4 (diff)
downloadupstream-ec9576607d19ddda04334142bdd7feef8cb5c5ca.tar.gz
upstream-ec9576607d19ddda04334142bdd7feef8cb5c5ca.tar.bz2
upstream-ec9576607d19ddda04334142bdd7feef8cb5c5ca.zip
busybox: fix IPv6 dependency
Commit 9f0cb135dd made BUSYBOX_CONFIG_FEATURE_IPV6 dependant on IPV6 but did not make its default value BUSYBOX_DEFAULT_FEATURE_IPV6 dependant on IPV6. BUSYBOX_DEFAULT_FEATURE_IPV6 will have as default value y if IPV6 is enabled otherwise n. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
Diffstat (limited to 'package/utils/busybox')
-rw-r--r--package/utils/busybox/Config-defaults.in3
-rw-r--r--package/utils/busybox/Makefile2
2 files changed, 3 insertions, 2 deletions
diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index d6c182145e..cd27a8969b 100644
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -2124,7 +2124,8 @@ config BUSYBOX_DEFAULT_WATCHDOG
default n
config BUSYBOX_DEFAULT_FEATURE_IPV6
bool
- default y
+ default y if IPV6
+ default n
config BUSYBOX_DEFAULT_FEATURE_UNIX_LOCAL
bool
default n
diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 6a761b4598..62af99d3ae 100644
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
PKG_VERSION:=1.29.3
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_FLAGS:=essential
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2