Merge pull request #5090 from fidencio/topic/keep-passing-build-suffix-to-qemu

qemu: Keep passing BUILD_SUFFIX

tools/packaging/static-build/qemu/Dockerfile

@@ -56,6 +56,9 @@ ARG QEMU_REPO
 # commit/tag/branch
 ARG QEMU_VERSION
 ARG PREFIX
+# BUILD_SUFFIX is used by the qemu-build-post.sh script to
+# properly rename non vanilla versions of the QEMU
+ARG BUILD_SUFFIX
 ARG HYPERVISOR_NAME
 ARG PKGVERSION
 ARG QEMU_DESTDIR

tools/packaging/static-build/qemu/build-base-qemu.sh

@@ -39,6 +39,7 @@ CACHE_TIMEOUT=$(date +"%Y-%m-%d")
 
 sudo "${container_engine}" build \
 	--build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \
+	--build-arg BUILD_SUFFIX=${build_suffix} \
 	--build-arg HYPERVISOR_NAME="${HYPERVISOR_NAME}" \
 	--build-arg PKGVERSION="${PKGVERSION}" \
 	--build-arg http_proxy="${http_proxy}" \