From 614c868c9d336790824d5043bcd66d761a9b8432 Mon Sep 17 00:00:00 2001
From: Assaf Berg <asssaf@users.noreply.github.com>
Date: Wed, 19 Jul 2023 19:17:47 -0700
Subject: [PATCH] add backing image format as required by newer qemu

---
 build.sh               | 4 ++--
 scripts/qcow2_handling | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 986f81cc3b..e8d898e04b 100755
--- a/build.sh
+++ b/build.sh
@@ -365,7 +365,7 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do
 				continue
 			fi
 		echo "Rebasing image-${CURR_STAGE}.qcow2 onto ${PREV_IMG}.qcow2"
-			qemu-img rebase -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2
+			qemu-img rebase -F qcow2 -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2
 			if [ "${CURR_STAGE}" = "${EXPORT_STAGE}" ]; then
 				break
 			fi
@@ -383,7 +383,7 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do
 				continue
 			fi
 		echo "Rebasing back image-${CURR_STAGE}.qcow2 onto ${PREV_IMG}.qcow2"
-			qemu-img rebase -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2
+			qemu-img rebase -F qcow2 -f qcow2 -u -b ${PREV_IMG}.qcow2 image-${CURR_STAGE}.qcow2
 			if [ "${CURR_STAGE}" = "${EXPORT_STAGE}" ]; then
 				break
 			fi
diff --git a/scripts/qcow2_handling b/scripts/qcow2_handling
index 66708e710e..9f7b6b5124 100644
--- a/scripts/qcow2_handling
+++ b/scripts/qcow2_handling
@@ -117,7 +117,7 @@ EOF
 					exit 1;
 				fi
 				echo "Creating backing image: image-${STAGE}.qcow2 <- ${WORK_DIR}/image-${PREV_STAGE}.qcow2"
-				qemu-img create -f qcow2 \
+				qemu-img create -F qcow2 -f qcow2 \
 					-o backing_file=${WORK_DIR}/image-${PREV_STAGE}.qcow2 \
 					${WORK_DIR}/image-${STAGE}.qcow2
 				sync