qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 03:01:09 +02:00
Code

target/x86: add to changes missed from [21246] preventing .vdi & .vmdk image generation

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21277 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2010-04-30 18:43:39 +00:00
parent 30851815b6
commit d12f20b38d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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