summaryrefslogtreecommitdiffstats
path: root/package/uclibc
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2015-06-01 23:52:57 +0200
committerPeter Korsgaard <peter@korsgaard.com>2015-06-01 23:52:57 +0200
commitcddaae8229f69aba753bcb6603f2f1e395e4f8dd (patch)
tree32d8ef5448083d487c4358ba035af797927038f3 /package/uclibc
parent841d3ac7e04fe3c2d8f4ccbc063db5650ec4779e (diff)
parent9b6a122841664ec8bea2b84e585adb3528909227 (diff)
downloadbuildroot-cddaae8229f69aba753bcb6603f2f1e395e4f8dd.tar.gz
buildroot-cddaae8229f69aba753bcb6603f2f1e395e4f8dd.zip
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/uclibc')
-rw-r--r--package/uclibc/Config.in6
-rw-r--r--package/uclibc/uclibc.mk1
2 files changed, 7 insertions, 0 deletions
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index b5525e505e..dd23853568 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -86,6 +86,12 @@ config BR2_UCLIBC_CONFIG
See also docs/README in this package.
If unsure, use the default.
+config BR2_UCLIBC_CONFIG_FRAGMENT_FILES
+ string "Additional uClibc configuration fragment files"
+ help
+ A space-separated list of configuration fragment files,
+ that will be merged to the main uClibc configuration file.
+
config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
bool "Enable RPC support"
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index ce9b2b49d6..b9dce7e2dd 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -42,6 +42,7 @@ UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG))
endif
UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE)
+UCLIBC_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_UCLIBC_CONFIG_FRAGMENT_FILES))
UCLIBC_KCONFIG_OPTS = \
$(UCLIBC_MAKE_FLAGS) \
OpenPOWER on IntegriCloud