From 62f05d4b481ab6765abe3de69628e6806770c02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 3 Aug 2022 14:44:10 +0200 Subject: [PATCH 1/2] ovmf: Adjust final tarball location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's create the OVMF tarball in the directory where the script was called from, instead of doing it in the $DESTDIR. This aligns with the logic being used for creating / extracting the tarball content, which is already in use by the kata-deploy local build scripts. Fixes: #4808 Signed-off-by: Fabiano Fidêncio --- tools/packaging/static-build/ovmf/build-ovmf.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/static-build/ovmf/build-ovmf.sh b/tools/packaging/static-build/ovmf/build-ovmf.sh index fe3925b1ce..9245dead48 100755 --- a/tools/packaging/static-build/ovmf/build-ovmf.sh +++ b/tools/packaging/static-build/ovmf/build-ovmf.sh @@ -90,7 +90,8 @@ if [ "${ovmf_build}" == "tdx" ]; then install $build_root/$ovmf_dir/"${build_path_arch}"/DumpTdxEventLog.efi ${install_dir} fi +local_dir=${PWD} pushd $DESTDIR -tar -czvf "${ovmf_dir}-${ovmf_build}.tar.gz" "./$PREFIX" +tar -czvf "${local_dir}/${ovmf_dir}-${ovmf_build}.tar.gz" "./$PREFIX" rm -rf $(dirname ./$PREFIX) popd From 8d1cb1d513e61ab9da47f397e1432c08fcb954e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 3 Aug 2022 14:47:03 +0200 Subject: [PATCH 2/2] td-shim: Adjust final tarball location MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's create the td-shim tarball in the directory where the script was called from, instead of doing it in the $DESTDIR. This aligns with the logic being used for creating / extracting the tarball content, which is already in use by the kata-deploy local build scripts. Fixes: #4809 Signed-off-by: Fabiano Fidêncio --- tools/packaging/static-build/td-shim/build-td-shim.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/static-build/td-shim/build-td-shim.sh b/tools/packaging/static-build/td-shim/build-td-shim.sh index ed933c007e..cbc336d666 100755 --- a/tools/packaging/static-build/td-shim/build-td-shim.sh +++ b/tools/packaging/static-build/td-shim/build-td-shim.sh @@ -35,7 +35,8 @@ install target/x86_64-unknown-uefi/release/final-boot-kernel.bin ${install_dir}/ popd #td-shim popd #${build_root} +local_dir=${PWD} pushd ${DESTDIR} -tar -czvf "td-shim.tar.gz" "./$PREFIX" +tar -czvf "${local_dir}/td-shim.tar.gz" "./$PREFIX" rm -rf $(dirname ./$PREFIX) popd #${DESTDIR}