From: Paul Spooren <mail@aparcar.org>
Date: Wed, 30 Dec 2020 19:08:17 +0000 (-1000)
Subject: build/image: warn if missing qemu-img for VDI/VMDK
X-Git-Tag: v21.02.0-rc1~575
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=ca289e322d87bd14271de84b25291c2979f96781;p=openwrt%2Fopenwrt.git

build/image: warn if missing qemu-img for VDI/VMDK

Currently `qemu-img` is used to convert raw x86 images to VDI and VMDK
images, used for virtual machines.

Having `qemu-img` in tree requires us to maintain an ancient version of
`qemu-utils`, which recently required extra work to compile with newer
compiler version.

This commit prints a warning message in case `qemu-img` is missing.

As a next step the in-tree version of `qemu-img` can be removed.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/include/image-commands.mk b/include/image-commands.mk
index 979eafb157..3beec80c8b 100644
--- a/include/image-commands.mk
+++ b/include/image-commands.mk
@@ -291,8 +291,12 @@ endef
 # Convert a raw image into a $1 type image.
 # E.g. | qemu-image vdi
 define Build/qemu-image
-	qemu-img convert -f raw -O $1 $@ $@.new
-	@mv $@.new $@
+	if command -v qemu-img; then \
+		qemu-img convert -f raw -O $1 $@ $@.new; \
+		mv $@.new $@; \
+	else \
+		echo "WARNING: Install qemu-img to create VDI/VMDK images" >&2; exit 1; \
+	fi
 endef
 
 define Build/qsdk-ipq-factory-nand