busybox: add back support for top-level menuconfig based config overrides (can be...

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39125

diff --git a/package/utils/busybox/Config.in b/package/utils/busybox/Config.in
index 9a8def66b9252caac6716b82cc4928ec34a92a03..c7532fdd824ce78f6980eaebce8d0ea44673f22e 100644 (file)
--- a/package/utils/busybox/Config.in
+++ b/package/utils/busybox/Config.in
@@ -1,6 +1,6 @@
 if PACKAGE_busybox
 
-config BUSYBOX_ENABLE_NFS_MOUNT
+config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
        bool "Enable NFS mount support"
 
 endif

diff --git a/package/utils/busybox/Makefile b/package/utils/busybox/Makefile
index 2cf44770b9f264768ee13a6e8cbb468879926f02..cf4f1f2060fa21fe90e75b7cb43410ba2b0dfbb9 100644 (file)
--- a/package/utils/busybox/Makefile
+++ b/package/utils/busybox/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \
                http://distfiles.gentoo.org/distfiles/
 PKG_MD5SUM:=9c0cae5a0379228e7b55e5b29528df8e
 
-PKG_CONFIG_DEPENDS:=CONFIG_BUSYBOX_ENABLE_NFS_MOUNT
+PKG_CONFIG_DEPENDS:=CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
 PKG_BUILD_PARALLEL:=1
 
 PKG_LICENSE:=GPLv2 BSD-4c
@@ -53,13 +53,14 @@ endef
 CONFIG_TEMPLATE:=./config/default
 
 LDLIBS:=m crypt
-ifdef CONFIG_BUSYBOX_ENABLE_NFS_MOUNT
+ifdef CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
   TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
   export LDFLAGS=$(TARGET_LDFLAGS)
   LDLIBS += rpc
-  CONFIG_TEMPLATE:=+ $(CONFIG_TEMPLATE) ./config/nfsmount
 endif
 
+CONFIG_TEMPLATE:=+ $(CONFIG_TEMPLATE) $(PKG_BUILD_DIR)/.config.build
+
 ENV_CONFIG:=$(wildcard $(TOPDIR)/env/busybox-config)
 ifneq ($(ENV_CONFIG),)
   CONFIG_TEMPLATE:=+ $(CONFIG_TEMPLATE) $(ENV_CONFIG)
@@ -67,6 +68,8 @@ ifneq ($(ENV_CONFIG),)
 endif
 
 define Build/Configure
+       grep -E '^(# )?CONFIG_BUSYBOX_CONFIG_' $(TOPDIR)/.config | \
+               sed -e 's,CONFIG_BUSYBOX_CONFIG_,CONFIG_,' > $(PKG_BUILD_DIR)/.config.build
        $(SCRIPT_DIR)/kconfig.pl $(CONFIG_TEMPLATE) > $(PKG_BUILD_DIR)/.config
        yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) \
                CC="$(TARGET_CC)" \

diff --git a/package/utils/busybox/config/nfsmount b/package/utils/busybox/config/nfsmount
deleted file mode 100644 (file)
index 3343c7d..0000000
--- a/package/utils/busybox/config/nfsmount
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_FEATURE_HAVE_RPC=y
-CONFIG_FEATURE_MOUNT_NFS=y