github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-18 17:33:02 +00:00
Code Issues Projects Releases Wiki Activity

fragments: skip some config base on the arch

Browse Source 
Not all the fragments in common are needed by all the arch. The fragment
can be skipped if the have the tag !arch. For example:
      # !s390x

Fixes: #1010

Signed-off-by: Alice Frosi <afrosi@de.ibm.com>
This commit is contained in:
Alice Frosi 2020-04-14 16:17:20 +02:00
parent a5ef8fcac0
commit 1c6aae1e15
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/build-kernel.sh
View File

@ -181,11 +181,13 @@ get_kernel_frag_path() {
local gpu_path="${arch_path}/../gpu" local gpu_path="${arch_path}/../gpu"
local kernel_path="$2" local kernel_path="$2"
local arch="$3"
local cmdpath="${kernel_path}/scripts/kconfig/merge_config.sh" local cmdpath="${kernel_path}/scripts/kconfig/merge_config.sh"
local config_path="${arch_path}/.config" local config_path="${arch_path}/.config"
local arch_configs="$(ls ${arch_path}/*.conf)" local arch_configs="$(ls ${arch_path}/*.conf)"
local common_configs="$(ls ${common_path}/*.conf)" # Exclude configs if they have !$arch tag in the header
local common_configs="$(grep "\!${arch}" ${common_path}/*.conf -L)"
local experimental_configs="$(ls ${common_path}/experimental/*.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
@ -275,7 +277,7 @@ get_default_kernel_config() {
archfragdir="${default_config_frags_dir}/${kernel_arch}" archfragdir="${default_config_frags_dir}/${kernel_arch}"
if [ -d "${archfragdir}" ]; then if [ -d "${archfragdir}" ]; then
config="$(get_kernel_frag_path ${archfragdir} ${kernel_path})" config="$(get_kernel_frag_path ${archfragdir} ${kernel_path} ${kernel_arch})"
else else
[ "${hypervisor}" == "firecracker" ] && hypervisor="kvm" [ "${hypervisor}" == "firecracker" ] && hypervisor="kvm"
config="${default_kernel_config_dir}/${kernel_arch}_kata_${hypervisor}_${major_kernel}.x" config="${default_kernel_config_dir}/${kernel_arch}_kata_${hypervisor}_${major_kernel}.x"

2
kernel/kata_config_version
View File

@ -1 +1 @@
78 79