github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 06:52:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6590 from zvonkok/build-kernel-fix

Browse Source 
tools: Avoid building the kernel twice
This commit is contained in:
Archana Shinde 2023-04-05 11:45:59 -07:00 committed by GitHub
commit 6af52cef3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/packaging/kernel/build-kernel.sh
View File

@ -419,6 +419,8 @@ install_kata() {
local kernel_path=${1:-} local kernel_path=${1:-}
[ -n "${kernel_path}" ] || die "kernel_path not provided" [ -n "${kernel_path}" ] || die "kernel_path not provided"
[ -d "${kernel_path}" ] || die "path to kernel does not exist, use ${script_name} setup" [ -d "${kernel_path}" ] || die "path to kernel does not exist, use ${script_name} setup"
[ -n "${arch_target}" ] || arch_target="$(uname -m)"
arch_target=$(arch_to_kernel "${arch_target}")
pushd "${kernel_path}" >>/dev/null pushd "${kernel_path}" >>/dev/null
config_version=$(get_config_version) config_version=$(get_config_version)
[ -n "${config_version}" ] || die "failed to get config version" [ -n "${config_version}" ] || die "failed to get config version"
@ -593,7 +595,6 @@ main() {
build_kernel "${kernel_path}" build_kernel "${kernel_path}"
;; ;;
install) install)
build_kernel "${kernel_path}"
install_kata "${kernel_path}" install_kata "${kernel_path}"
;; ;;
setup) setup)

2
tools/packaging/kernel/kata_config_version
View File

@ -1 +1 @@
102 103