aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2019-08-12 12:04:04 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-08-17 16:57:32 +0200
commit33411ee9190bf6783eef0d1fac90ec1dd7c2cdff (patch)
treecac91103c7a8fb4ceec09e17cee1a89855a270d2
parent0d0617ff14b8b020896680de1f1a49c7ba8a5e0d (diff)
downloadupstream-33411ee9190bf6783eef0d1fac90ec1dd7c2cdff.tar.gz
upstream-33411ee9190bf6783eef0d1fac90ec1dd7c2cdff.tar.bz2
upstream-33411ee9190bf6783eef0d1fac90ec1dd7c2cdff.zip
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 <fe@dev.tdt.de>
-rw-r--r--target/linux/x86/image/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 24825f2ba2..ac70e771c8 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