target/x86: add to changes missed from [21246] preventing .vdi & .vmdk image generation
authorNicolas Thill <nico@openwrt.org>
Fri, 30 Apr 2010 18:43:39 +0000 (18:43 +0000)
committerNicolas Thill <nico@openwrt.org>
Fri, 30 Apr 2010 18:43:39 +0000 (18:43 +0000)
SVN-Revision: 21277

target/linux/x86/image/Makefile

index 1c94634f2c579946f1174dc996dc2fa9b95aad09..912dae235f108d44871709a672e7fdf1d4fe6f98 100644 (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