mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
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
This commit is contained in:
parent
5c2aee90ac
commit
d2329f88f3
@ -1,6 +1,6 @@
|
||||
if PACKAGE_busybox
|
||||
|
||||
config BUSYBOX_ENABLE_NFS_MOUNT
|
||||
config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
|
||||
bool "Enable NFS mount support"
|
||||
|
||||
endif
|
||||
|
@ -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)" \
|
||||
|
@ -1,2 +0,0 @@
|
||||
CONFIG_FEATURE_HAVE_RPC=y
|
||||
CONFIG_FEATURE_MOUNT_NFS=y
|
Loading…
Reference in New Issue
Block a user