github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 08:17:37 +00:00
Code Issues Projects Releases Wiki Activity

kernel: if experimental, pull experimental configs

Browse Source 
Signed-off-by: Eric Ernst <eric.ernst@intel.com>
This commit is contained in:
Eric Ernst 2019-09-04 12:57:06 -07:00
parent 74adb72b22
commit b00b0d9e7d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/build-kernel.sh
View File

@ -164,6 +164,7 @@ get_kernel_frag_path() {
local arch_configs="$(ls ${arch_path}/*.conf)" local arch_configs="$(ls ${arch_path}/*.conf)"
local common_configs="$(ls ${common_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 # 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 # 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 # handle specific cases, then add the path definition and search/list/cat
# here. # here.
local all_configs="${common_configs} ${arch_configs}" 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}" info "Constructing config from fragments: ${config_path}"
local results=$(export KCONFIG_CONFIG=${config_path}; \ local results=$(export KCONFIG_CONFIG=${config_path}; \