From 420eb6e984b0ae6e871ee3d77ade86e913ec8171 Mon Sep 17 00:00:00 2001
From: Eric Ernst <eric.ernst@intel.com>
Date: Tue, 15 Oct 2019 16:39:47 -0700
Subject: [PATCH] qemu-virtiofs: Fix tar naming for qemu with virtiofs support

Fixes the naming of tarball for qemu-virtiofs so that it is different
from the qemu one.

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
---
 release/kata-deploy-binaries.sh                          | 2 +-
 static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/release/kata-deploy-binaries.sh b/release/kata-deploy-binaries.sh
index 53d992cf93..0c39c3d9e0 100755
--- a/release/kata-deploy-binaries.sh
+++ b/release/kata-deploy-binaries.sh
@@ -142,7 +142,7 @@ install_qemu_virtiofsd() {
 	info "build static qemu-virtiofs"
 	"${script_dir}/../static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh"
 	info "Install static qemu-virtiofs"
-	tar xf kata-qemu-static.tar.gz -C "${destdir}"
+	tar xf kata-qemu-virtiofs-static.tar.gz -C "${destdir}"
 }
 
 # Install static firecracker asset
diff --git a/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh b/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
index 1412559356..e1a21b0903 100755
--- a/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
+++ b/static-build/qemu-virtiofs/build-static-qemu-virtiofs.sh
@@ -18,7 +18,8 @@ qemu_virtiofs_repo=$(get_from_kata_deps "assets.hypervisor.qemu-experimental.url
 # This tag will be supported on the runtime versions.yaml
 qemu_virtiofs_tag=$(get_from_kata_deps "assets.hypervisor.qemu-experimental.tag")
 qemu_tar="kata-qemu-static.tar.gz"
-qemu_tmp_tar="kata-qemu-static-tmp.tar.gz"
+qemu_virtiofs_tar="kata-qemu-virtiofs-static.tar.gz"
+qemu_tmp_tar="kata-qemu-virtiofs-static-tmp.tar.gz"
 
 info "Build ${qemu_virtiofs_repo} tag: ${qemu_virtiofs_tag}"
 
@@ -46,4 +47,4 @@ sudo chown ${USER}:${USER} "${PWD}/${qemu_tar}"
 
 # Remove blacklisted binaries
 gzip -d < "${qemu_tar}" | tar --delete --wildcards -f - ${qemu_black_list[*]} | gzip > "${qemu_tmp_tar}"
-mv -f "${qemu_tmp_tar}" "${qemu_tar}"
+mv -f "${qemu_tmp_tar}" "${qemu_virtiofs_tar}"