From ee7de8abcc2c9fd0adbf1aa182e39ec604bda2ff Mon Sep 17 00:00:00 2001 From: zyt312074545 Date: Tue, 27 Apr 2021 15:47:21 +0000 Subject: [PATCH] tools: fix build kernel shell error Build kernel shell setup with -f, don't find patches directory path, because patches_path is none, so fix this error. Fixes: #1768 Signed-off-by: zyt312074545 --- tools/packaging/kernel/build-kernel.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/packaging/kernel/build-kernel.sh b/tools/packaging/kernel/build-kernel.sh index 27b7b429c5..a99adc27df 100755 --- a/tools/packaging/kernel/build-kernel.sh +++ b/tools/packaging/kernel/build-kernel.sh @@ -31,7 +31,7 @@ readonly kernel_config_repo="github.com/${project_name}/kata-containers/tools/pa readonly patches_repo="github.com/${project_name}/kata-containers/tools/packaging" readonly patches_repo_dir="${GOPATH}/src/${patches_repo}" # Default path to search patches to apply to kernel -readonly default_patches_dir="${script_dir}/patches/" +readonly default_patches_dir="${script_dir}/patches" # Default path to search config for kata readonly default_kernel_config_dir="${script_dir}/configs" # Default path to search for kernel config fragments @@ -322,12 +322,12 @@ setup_kernel() { fi [ -n "$kernel_path" ] || die "failed to find kernel source path" - - get_config_and_patches - - [ -d "${patches_path}" ] || die " patches path '${patches_path}' does not exist" fi + get_config_and_patches + + [ -d "${patches_path}" ] || die " patches path '${patches_path}' does not exist" + local major_kernel major_kernel=$(get_major_kernel_version "${kernel_version}") local patches_dir_for_version="${patches_path}/${major_kernel}.x"