domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target/x86/image: use qemu-img from STAGING_DIR_HOST

Browse Source 
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>
This commit is contained in:
Florian Eckert
2019-08-12 12:04:04 +02:00
committed by Hauke Mehrtens
parent 0d0617ff14
commit 33411ee919
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/x86/image/Makefile
View File

@@ -122,7 +122,7 @@ endef
ifneq ($(CONFIG_VDI_IMAGES),) ifneq ($(CONFIG_VDI_IMAGES),)
define Image/Build/vdi define Image/Build/vdi
rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi || true 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).img \
$(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi
endef endef
@@ -131,7 +131,7 @@ endif
ifneq ($(CONFIG_VMDK_IMAGES),) ifneq ($(CONFIG_VMDK_IMAGES),)
define Image/Build/vmdk define Image/Build/vmdk
rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk || true 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).img \
$(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk
endef endef