From 37be7ca4e829a7620c3928ac8a0284d00bd41b5b Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sun, 7 Oct 2018 20:37:47 +0200 Subject: [PATCH] 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 (backported from ec9576607d19ddda04334142bdd7feef8cb5c5ca) --- package/utils/busybox/Config-defaults.in | 3 ++- package/utils/busybox/Makefile | 2 +- 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 -- 2.30.2