domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 21277
This commit is contained in:
Nicolas Thill
2010-04-30 18:43:39 +00:00
parent 82221d71e5
commit a64f53f482
1 changed files with 2 additions and 2 deletions
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 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