github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-13 12:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #112 from Weichen81/master

Browse Source 
Kernel: Normalize target-arch for setup-kernel function
This commit is contained in:
James O. D. Hunt
2018-07-31 13:33:31 +01:00
committed by GitHub
parent f0e1d9dc4d 0e64f2a8c6
commit 90fa9305e0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/build-kernel.sh
View File

@@ -34,7 +34,7 @@ readonly patches_repo_dir="${GOPATH}/src/${patches_repo}"
# Default path to search patches to apply to kernel # Default path to search patches to apply to kernel
readonly default_patches_dir="${patches_repo_dir}/kernel/patches/" readonly default_patches_dir="${patches_repo_dir}/kernel/patches/"
# Default path to search config for kata # Default path to search config for kata
readonly default_kernel_config_dir="${GOPATH}/src/${kernel_config_repo}/kernel/configs/" readonly default_kernel_config_dir="${GOPATH}/src/${kernel_config_repo}/kernel/configs"
#Path to kernel directory #Path to kernel directory
kernel_path="" kernel_path=""
# #
@@ -188,6 +188,7 @@ setup_kernel() {
[ -n "${hypervisor_target}" ] || hypervisor_target="kvm" [ -n "${hypervisor_target}" ] || hypervisor_target="kvm"
[ -n "${arch_target}" ] || arch_target="$(uname -m)" [ -n "${arch_target}" ] || arch_target="$(uname -m)"
arch_target=$(arch_to_kernel "${arch_target}")
[ -n "${kernel_config_path}" ] || kernel_config_path=$(get_default_kernel_config "${kernel_version}" "${hypervisor_target}" "${arch_target}") [ -n "${kernel_config_path}" ] || kernel_config_path=$(get_default_kernel_config "${kernel_version}" "${hypervisor_target}" "${arch_target}")
cp "${kernel_config_path}" ./.config cp "${kernel_config_path}" ./.config

2
kernel/kata_config_version
View File

@@ -1 +1 @@
3 4