KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

busybox: add back support for top-level menuconfig based config overrides (can be used by custom packages to alter the config)

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39125
This commit is contained in:
Felix Fietkau 2013-12-17 20:37:27 +00:00
parent 5c2aee90ac
commit d2329f88f3
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/utils/busybox/Config.in
View file

@ -1,6 +1,6 @@
if PACKAGE_busybox if PACKAGE_busybox
config BUSYBOX_ENABLE_NFS_MOUNT config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
bool "Enable NFS mount support" bool "Enable NFS mount support"
endif endif

9
package/utils/busybox/Makefile
View file

@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads \
http://distfiles.gentoo.org/distfiles/ http://distfiles.gentoo.org/distfiles/
PKG_MD5SUM:=9c0cae5a0379228e7b55e5b29528df8e 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_BUILD_PARALLEL:=1
PKG_LICENSE:=GPLv2 BSD-4c PKG_LICENSE:=GPLv2 BSD-4c
@ -53,13 +53,14 @@ endef
CONFIG_TEMPLATE:=./config/default CONFIG_TEMPLATE:=./config/default
LDLIBS:=m crypt LDLIBS:=m crypt
ifdef CONFIG_BUSYBOX_ENABLE_NFS_MOUNT ifdef CONFIG_BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
export LDFLAGS=$(TARGET_LDFLAGS) export LDFLAGS=$(TARGET_LDFLAGS)
LDLIBS += rpc LDLIBS += rpc
CONFIG_TEMPLATE:=+ $(CONFIG_TEMPLATE) ./config/nfsmount
endif endif
CONFIG_TEMPLATE:=+ $(CONFIG_TEMPLATE) $(PKG_BUILD_DIR)/.config.build
ENV_CONFIG:=$(wildcard $(TOPDIR)/env/busybox-config) ENV_CONFIG:=$(wildcard $(TOPDIR)/env/busybox-config)
ifneq ($(ENV_CONFIG),) ifneq ($(ENV_CONFIG),)
CONFIG_TEMPLATE:=+ $(CONFIG_TEMPLATE) $(ENV_CONFIG) CONFIG_TEMPLATE:=+ $(CONFIG_TEMPLATE) $(ENV_CONFIG)
@ -67,6 +68,8 @@ ifneq ($(ENV_CONFIG),)
endif endif
define Build/Configure 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 $(SCRIPT_DIR)/kconfig.pl $(CONFIG_TEMPLATE) > $(PKG_BUILD_DIR)/.config
yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) \ yes 'n' | $(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \

2
package/utils/busybox/config/nfsmount
View file

@ -1,2 +0,0 @@
CONFIG_FEATURE_HAVE_RPC=y
CONFIG_FEATURE_MOUNT_NFS=y