From 195b5744ea49a4abe73e67c6f81906179136198f Mon Sep 17 00:00:00 2001 From: Wei Chen Date: Tue, 31 Jul 2018 05:14:17 +0000 Subject: [PATCH 1/3] kernel: Normalize target-arch for setup-kernel function As we had dicussed in issue#140: https://github.com/kata-containers/documentation/issues/140 We have normalized output for x86_64, arm64 and ppc64. And James had implemented a kata-arch.sh in tests/.ci : https://github.com/kata-containers/tests/blob/master/.ci/kata-arch.sh But in build-kernel.sh the setup-kernel function had used the "uname -m" output as target-arch directly, this will cause the following scripts can't find kernel config files. Fixed #111 Signed-off-by: Wei Chen Signed-off-by: Penny Zheng --- kernel/build-kernel.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/build-kernel.sh b/kernel/build-kernel.sh index 48de6ba822..ab9573a6dc 100755 --- a/kernel/build-kernel.sh +++ b/kernel/build-kernel.sh @@ -188,6 +188,7 @@ setup_kernel() { [ -n "${hypervisor_target}" ] || hypervisor_target="kvm" [ -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}") cp "${kernel_config_path}" ./.config From 6f4023f6e2690b93092a93774ddb6c88618650eb Mon Sep 17 00:00:00 2001 From: Wei Chen Date: Tue, 31 Jul 2018 06:43:25 +0000 Subject: [PATCH 2/3] kernel: Remove redundant slash of default_kernel_config_dir Run new script in arm server to build kernel, then find a minor typo. An extra "/" in the end of default_kernel_config_dir will cause error: ERROR: failed to find default config ../src/github.com/kata-containers/packaging/kernel/configs//aarch64_kata_kvm_4.14.x Signed-off-by: Wei Chen Signed-off-by: Penny Zheng --- kernel/build-kernel.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/build-kernel.sh b/kernel/build-kernel.sh index ab9573a6dc..ae56215909 100755 --- a/kernel/build-kernel.sh +++ b/kernel/build-kernel.sh @@ -34,7 +34,7 @@ readonly patches_repo_dir="${GOPATH}/src/${patches_repo}" # Default path to search patches to apply to kernel readonly default_patches_dir="${patches_repo_dir}/kernel/patches/" # 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 kernel_path="" # From 0e64f2a8c6539e3ef30b93113d70fb6b7f9325ae Mon Sep 17 00:00:00 2001 From: Wei Chen Date: Tue, 31 Jul 2018 05:40:03 +0000 Subject: [PATCH 3/3] kernel: Update kata_config_version to trace issue#111 Signed-off-by: Wei Chen --- kernel/kata_config_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 00750edc07..b8626c4cff 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -3 +4