From 51b1df2333a63dc125f5a6179cc4dcd82b53696c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 2 Feb 2024 11:03:01 +0100 Subject: [PATCH 1/4] packaging: Fix typo to get the extra_tarballs path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should've been "${m#*:}" instead of "${m#&:}". Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 90d548f539..eb66a3bf49 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -197,7 +197,7 @@ install_cached_tarball_component() { IFS=' ' read -a mapping <<< "${extra_tarballs}" for m in ${mapping[@]}; do local extra_tarball_name=${m%:*} - local extra_tarball_path=${m#&:} + local extra_tarball_path=${m#*:} mv ${extra_tarball_name} ${extra_tarball_path} done From 31b21093b043c88ae785df8d7f1501185eb29053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 2 Feb 2024 11:04:22 +0100 Subject: [PATCH 2/4] packaging: Pass the kernel flavour to get_kernel_modules_dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I made this a required argument during the series and ended up forgetting to add that while calling the function. Signed-off-by: Fabiano Fidêncio --- .../packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index eb66a3bf49..8422521791 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -351,7 +351,7 @@ install_cached_kernel_tarball_component() { return 0 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 tar xvf "${workdir}/kata-static-${kernel_name}-modules.tar.xz" -C "${modules_dir}" && return 0 @@ -965,7 +965,7 @@ handle_build() { kernel*-confidential|kernel-sev) local modules_final_tarball_path="${workdir}/kata-static-${build_target}-modules.tar.xz" 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}" sudo rm -f build From 228bc48c73387b468ba2a005d3de71c5a156f9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 2 Feb 2024 11:05:17 +0100 Subject: [PATCH 3/4] packaging: Fix kernel confidential name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should be "kernel-confidential" instead of "kernel". Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 8422521791..d89634f93c 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -402,7 +402,7 @@ install_kernel_confidential() { install_kernel_helper \ "assets.kernel.confidential.version" \ - "kernel" \ + "kernel-confidential" \ "-x confidential -u ${kernel_url}" } From 2ff3f0afc61830457516ee028549a9ef3bac06a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 2 Feb 2024 11:05:36 +0100 Subject: [PATCH 4/4] packaging: Remove trailing whitespace from extra_tarballs arg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was overlooked during the reviews. Fixes: #6415 -- part III Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index d89634f93c..bc5b611ff0 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -344,7 +344,7 @@ install_cached_kernel_tarball_component() { "${latest_builder_image}" \ "${final_tarball_name}" \ "${final_tarball_path}" \ - "${extra_tarballs} " \ + "${extra_tarballs}" \ || return 1 if [[ "${kernel_name}" != "kernel-sev" ]] && [[ "${kernel_name}" != "kernel"*"-confidential" ]]; then