summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-30 18:43:39 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-30 18:43:39 +0000
commitd12f20b38d39ef59eb98f0cd67e6b10f7edb92e3 (patch)
tree30714f1eb5998744bfbd4c70a9078596f4495b67
parent30851815b6c2ccbd4bb3cefbdae01506ce387190 (diff)
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
-rw-r--r--target/linux/x86/image/Makefile4
1 files changed, 2 insertions, 2 deletions
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