mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-12 01:44:54 +00:00
target/x86: add to changes missed from [21246] preventing .vdi & .vmdk image generation
SVN-Revision: 21277
This commit is contained in:
parent
82221d71e5
commit
a64f53f482
@ -152,7 +152,7 @@ ifneq ($(CONFIG_X86_VDI_IMAGES),)
|
||||
define Image/Build/vdi
|
||||
# left here because the image builder doesnt need these
|
||||
ifeq ($(1),ext2)
|
||||
rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi || true
|
||||
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
|
||||
VBoxManage convertfromraw -format VDI \
|
||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
||||
@ -166,7 +166,7 @@ ifneq ($(CONFIG_X86_VMDK_IMAGES),)
|
||||
define Image/Build/vmdk
|
||||
# left here because the image builder doesnt need these
|
||||
ifeq ($(1),ext2)
|
||||
rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vmdk || true
|
||||
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
|
||||
qemu-img convert -f raw -O vmdk \
|
||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
|
||||
|
Loading…
Reference in New Issue
Block a user