From 58480aac342edab57b96378eb7d19a638909d2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fabiano.fidencio@intel.com>
Date: Mon, 28 Nov 2022 19:41:45 +0100
Subject: [PATCH] packaging: Move calc_qemu_files_sha256sum() to lib.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We're going to use this function from different places, so we better
move it to lib.sh and avoid rewriting it.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
---
 tools/packaging/scripts/lib.sh                           | 8 ++++++++
 .../packaging/static-build/qemu/build-static-qemu-cc.sh  | 9 ---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/tools/packaging/scripts/lib.sh b/tools/packaging/scripts/lib.sh
index 49520c6616..4ad7d0b14f 100755
--- a/tools/packaging/scripts/lib.sh
+++ b/tools/packaging/scripts/lib.sh
@@ -178,3 +178,11 @@ sha256sum_from_files() {
 		echo $(awk '{ print $1 }' <<< $shasum)
 	fi
 }
+
+calc_qemu_files_sha256sum() {
+	local files="${this_script_dir}/../qemu \
+		${this_script_dir}/../static-build/qemu.blacklist \
+		${this_script_dir}/../static-build/scripts"
+
+	sha256sum_from_files "$files"
+}
diff --git a/tools/packaging/static-build/qemu/build-static-qemu-cc.sh b/tools/packaging/static-build/qemu/build-static-qemu-cc.sh
index 47ffe6cd03..724e606b08 100755
--- a/tools/packaging/static-build/qemu/build-static-qemu-cc.sh
+++ b/tools/packaging/static-build/qemu/build-static-qemu-cc.sh
@@ -36,15 +36,6 @@ get_qemu_information() {
 	[ -n "${qemu_version}" ] || die "failed to get qemu version"
 }
 
-calc_qemu_files_sha256sum() {
-	info "pkg directory is at ${pkg_dir}"
-	local files="${pkg_dir}/qemu \
-		${pkg_dir}/static-build/qemu.blacklist \
-		${pkg_dir}/static-build/scripts"
-
-	sha256sum_from_files "$files"
-}
-
 cached_or_build_qemu_tar() {
 	# Check latest qemu cc tar version sha256sum
 	local latest=$(curl -sfL "${qemu_latest_build_url}/latest") || latest="none"