aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-12-17 20:37:27 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-12-17 20:37:27 +0000
commitd2329f88f376e1e55d6d0377a27514681568a915 (patch)
treec0f680c26fd8ee2bb687e20d41f706c68cecacd1
parent5c2aee90acc78d273d96a5f3126537257757fef7 (diff)
downloadupstream-d2329f88f376e1e55d6d0377a27514681568a915.tar.gz
upstream-d2329f88f376e1e55d6d0377a27514681568a915.tar.bz2
upstream-d2329f88f376e1e55d6d0377a27514681568a915.zip
busybox: add back support for top-level menuconfig based config overrides (can be used by custom packages to alter the config)
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39125
-rw-r--r--package/utils/busybox/Config.in2
-rw-r--r--package/utils/busybox/Makefile9
-rw-r--r--package/utils/busybox/config/nfsmount2
3 files changed, 7 insertions, 6 deletions
diff --git a/package/utils/busybox/Config.in b/package/utils/busybox/Config.in
index 9a8def66b9..c7532fdd82 100644
--- 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 2cf44770b9..cf4f1f2060 100644
--- 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
index 3343c7d959..0000000000
--- a/package/utils/busybox/config/nfsmount
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_FEATURE_HAVE_RPC=y
-CONFIG_FEATURE_MOUNT_NFS=y