From 8aea0611d9a848beb3fdc9249494a4beb98c436e Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Fri, 30 Apr 2010 18:43:39 +0000 Subject: 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 --- target/linux/x86/image/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'target/linux') diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 1c94634f2c..912dae235f 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -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 -- cgit v1.2.3