RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Paul Spooren 2020-12-30 09:08:17 -10:00
parent cbd67dbdcd
commit ca289e322d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/image-commands.mk
View File

@ -291,8 +291,12 @@ endef
# Convert a raw image into a $1 type image. # Convert a raw image into a $1 type image.
# E.g. | qemu-image vdi # E.g. | qemu-image vdi
define Build/qemu-image define Build/qemu-image
qemu-img convert -f raw -O $1 $@ $@.new if command -v qemu-img; then \
@mv $@.new $@ 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 endef
define Build/qsdk-ipq-factory-nand define Build/qsdk-ipq-factory-nand