From cd0674db61f0482aa7b0c2e43f206f54ebf3ef40 Mon Sep 17 00:00:00 2001
From: Zvonko Kaiser <zkaiser@nvidia.com>
Date: Wed, 5 Mar 2025 23:25:48 +0000
Subject: [PATCH] shellcheck: fix build-qemu.sh

Fix all warnings and errors

Signed-off-by: Zvonko Kaiser <zkaiser@nvidia.com>
---
 .../packaging/static-build/qemu/build-qemu.sh | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/tools/packaging/static-build/qemu/build-qemu.sh b/tools/packaging/static-build/qemu/build-qemu.sh
index fb7c2d01a8..5c10073517 100755
--- a/tools/packaging/static-build/qemu/build-qemu.sh
+++ b/tools/packaging/static-build/qemu/build-qemu.sh
@@ -8,15 +8,6 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-# Environment variables passed from container
-QEMU_REPO="${QEMU_REPO:-}"
-QEMU_VERSION_NUM="${QEMU_VERSION_NUM:-}"
-HYPERVISOR_NAME="${HYPERVISOR_NAME:-}"
-PKGVERSION="${PKGVERSION:-}"
-PREFIX="${PREFIX:-}"
-QEMU_DESTDIR="${QEMU_DESTDIR:-}"
-QEMU_TARBALL="${QEMU_TARBALL:-}"
-
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 kata_packaging_dir="${script_dir}/../.."
@@ -27,16 +18,27 @@ kata_static_build_scripts="${kata_static_build_dir}/scripts"
 
 ARCH=${ARCH:-$(uname -m)}
 
-rm -rf qemu
+QEMU_REPO="${QEMU_REPO:-}"
+QEMU_VERSION_NUM="${QEMU_VERSION_NUM:-}"
+QEMU_TARBALL="${QEMU_TARBALL:-}"
+QEMU_DESTDIR="${QEMU_DESTDIR:-}"
+HYPERVISOR_NAME="${HYPERVISOR_NAME:-}"
+PREFIX="${PREFIX:-}"
+PKGVERSION=${PKGVERSION:-}
+
 git clone --depth=1 "${QEMU_REPO}" qemu
 pushd qemu
 git fetch --depth=1 origin "${QEMU_VERSION_NUM}"
 git checkout FETCH_HEAD
 scripts/git-submodule.sh update meson capstone
-"${kata_packaging_scripts}/patch_qemu.sh" "${QEMU_VERSION_NUM}" "${kata_packaging_dir}/qemu/patches"
-PREFIX="${PREFIX}" "${kata_packaging_scripts}/configure-hypervisor.sh" -s "${HYPERVISOR_NAME}" "${ARCH}" | xargs ./configure  --with-pkgversion="${PKGVERSION}"
-make -j"$(nproc --ignore=1)"
+"${kata_packaging_scripts}"/patch_qemu.sh "${QEMU_VERSION_NUM}" "${kata_packaging_dir}/qemu/patches"
+if [[ "$(uname -m)" != "${ARCH}" ]] && [[ "${ARCH}" == "s390x" ]]; then
+       PREFIX="${PREFIX}" "${kata_packaging_scripts}"/configure-hypervisor.sh -s "${HYPERVISOR_NAME}" "${ARCH}" | xargs ./configure  --with-pkgversion="${PKGVERSION}" --cc=s390x-linux-gnu-gcc --cross-prefix=s390x-linux-gnu- --prefix="${PREFIX}" --target-list=s390x-softmmu
+else
+       PREFIX="${PREFIX}" "${kata_packaging_scripts}"/configure-hypervisor.sh -s "${HYPERVISOR_NAME}" "${ARCH}" | xargs ./configure  --with-pkgversion="${PKGVERSION}"
+fi
+make -j"$(nproc +--ignore 1)"
 make install DESTDIR="${QEMU_DESTDIR}"
 popd
-"${kata_static_build_scripts}/qemu-build-post.sh"
+"${kata_static_build_scripts}"/qemu-build-post.sh
 mv "${QEMU_DESTDIR}/${QEMU_TARBALL}" /share/