From b00b0d9e7d1deaf3885bb728fd380302b6df2f81 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Wed, 4 Sep 2019 12:57:06 -0700 Subject: [PATCH] kernel: if experimental, pull experimental configs Signed-off-by: Eric Ernst --- kernel/build-kernel.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/build-kernel.sh b/kernel/build-kernel.sh index f6b4fb3f36..59124c63cb 100755 --- a/kernel/build-kernel.sh +++ b/kernel/build-kernel.sh @@ -164,6 +164,7 @@ get_kernel_frag_path() { local arch_configs="$(ls ${arch_path}/*.conf)" local common_configs="$(ls ${common_path}/*.conf)" + local experimental_configs="$(ls ${common_path}/experimental/*.conf)" # These are the strings that the kernel merge_config.sh script kicks out # when it reports an error or warning condition. We search for them in the @@ -176,6 +177,9 @@ get_kernel_frag_path() { # handle specific cases, then add the path definition and search/list/cat # here. local all_configs="${common_configs} ${arch_configs}" + if [[ ${experimental_kernel} == "true" ]]; then + all_configs="${all_configs} ${experimental_configs}" + fi info "Constructing config from fragments: ${config_path}" local results=$(export KCONFIG_CONFIG=${config_path}; \