From: Florian Eckert Date: Mon, 12 Aug 2019 10:04:04 +0000 (+0200) Subject: target/x86/image: use qemu-img from STAGING_DIR_HOST X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33411ee9190bf6783eef0d1fac90ec1dd7c2cdff;p=openwrt%2Fstaging%2Fblogic.git target/x86/image: use qemu-img from STAGING_DIR_HOST The host tool package qemu is build for the target x86. The installed tool qemu-img is needed to build vdi or vmdk images. In the image Makefile we use however the host installed qemu-img command and not the tool from the buildsystem. This commit force to use the already build qemu-img command from the openwrt toolchain. Signed-off-by: Florian Eckert --- diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 24825f2ba2c2..ac70e771c86f 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -122,7 +122,7 @@ endef ifneq ($(CONFIG_VDI_IMAGES),) define Image/Build/vdi rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi || true - qemu-img convert -f raw -O vdi \ + $(STAGING_DIR_HOST)/bin/qemu-img convert -f raw -O vdi \ $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi endef @@ -131,7 +131,7 @@ endif ifneq ($(CONFIG_VMDK_IMAGES),) define Image/Build/vmdk rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk || true - qemu-img convert -f raw -O vmdk \ + $(STAGING_DIR_HOST)/bin/qemu-img convert -f raw -O vmdk \ $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk endef