github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-05 10:50:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9001 from fidencio/topic/fix-cache-for-confidential-kernel-part-III

Browse Source 
packaging: Don't build the confidential / sev kernel twice -- part III
This commit is contained in:
Fabiano Fidêncio
2024-02-02 15:19:41 +01:00
committed by GitHub
parent 424fbfe58f 2ff3f0afc6
commit 741ed1c8bd
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -197,7 +197,7 @@ install_cached_tarball_component() {
IFS=' ' read -a mapping <<< "${extra_tarballs}" IFS=' ' read -a mapping <<< "${extra_tarballs}"
for m in ${mapping[@]}; do for m in ${mapping[@]}; do
local extra_tarball_name=${m%:*} local extra_tarball_name=${m%:*}
local extra_tarball_path=${m#&:} local extra_tarball_path=${m#*:}
mv ${extra_tarball_name} ${extra_tarball_path} mv ${extra_tarball_name} ${extra_tarball_path}
done done
@@ -351,7 +351,7 @@ install_cached_kernel_tarball_component() {
return 0 return 0
fi fi
local modules_dir=$(get_kernel_modules_dir ${kernel_version} ${kernel_kata_config_version}) local modules_dir=$(get_kernel_modules_dir ${kernel_version} ${kernel_kata_config_version} ${build_target})
mkdir -p "${modules_dir}" || true mkdir -p "${modules_dir}" || true
tar xvf "${workdir}/kata-static-${kernel_name}-modules.tar.xz" -C "${modules_dir}" && return 0 tar xvf "${workdir}/kata-static-${kernel_name}-modules.tar.xz" -C "${modules_dir}" && return 0
@@ -402,7 +402,7 @@ install_kernel_confidential() {
install_kernel_helper \ install_kernel_helper \
"assets.kernel.confidential.version" \ "assets.kernel.confidential.version" \
"kernel" \ "kernel-confidential" \
"-x confidential -u ${kernel_url}" "-x confidential -u ${kernel_url}"
} }
@@ -965,7 +965,7 @@ handle_build() {
kernel*-confidential|kernel-sev) kernel*-confidential|kernel-sev)
local modules_final_tarball_path="${workdir}/kata-static-${build_target}-modules.tar.xz" local modules_final_tarball_path="${workdir}/kata-static-${build_target}-modules.tar.xz"
if [ ! -f "${modules_final_tarball_path}" ]; then if [ ! -f "${modules_final_tarball_path}" ]; then
local modules_dir=$(get_kernel_modules_dir ${kernel_version} ${kernel_kata_config_version}) local modules_dir=$(get_kernel_modules_dir ${kernel_version} ${kernel_kata_config_version} ${build_target})
pushd "${modules_dir}" pushd "${modules_dir}"
sudo rm -f build sudo rm -f build