mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-25 05:29:00 +03:00
target/x86: add to changes missed from [21246] preventing .vdi & .vmdk image generation
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21277 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
30851815b6
commit
d12f20b38d
@ -152,7 +152,7 @@ ifneq ($(CONFIG_X86_VDI_IMAGES),)
|
|||||||
define Image/Build/vdi
|
define Image/Build/vdi
|
||||||
# left here because the image builder doesnt need these
|
# left here because the image builder doesnt need these
|
||||||
ifeq ($(1),ext2)
|
ifeq ($(1),ext2)
|
||||||
rm $(BIN_DIR)/$(IMG_PREFIX)-ext2.vdi || true
|
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
|
||||||
VBoxManage convertfromraw -format VDI \
|
VBoxManage convertfromraw -format VDI \
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
||||||
@ -166,7 +166,7 @@ ifneq ($(CONFIG_X86_VMDK_IMAGES),)
|
|||||||
define Image/Build/vmdk
|
define Image/Build/vmdk
|
||||||
# left here because the image builder doesnt need these
|
# left here because the image builder doesnt need these
|
||||||
ifeq ($(1),ext2)
|
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 \
|
qemu-img convert -f raw -O vmdk \
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
|
||||||
|
Loading…
Reference in New Issue
Block a user