Use VBoxManage instead of obsolete vditool to generate VirtualBox images.

SVN-Revision: 13821
This commit is contained in:
Steven Barth 2009-01-02 14:35:18 +00:00
parent 9f8c82da09
commit 5c95516f24
2 changed files with 4 additions and 4 deletions

View File

@ -36,7 +36,7 @@ config X86_GRUB_BOOTOPTS
config X86_VDI_IMAGES
bool "Build VirtualBox image files (VDI). Requires vditool"
bool "Build VirtualBox image files (VDI). Requires VBoxManage"
depends TARGET_x86
depends TARGET_ROOTFS_EXT2FS
depends X86_GRUB_IMAGES

View File

@ -66,7 +66,7 @@ ifeq ($(CONFIG_X86_VDI_IMAGES),y)
# left here because the image builder doesnt need these
ifeq ($(1),ext2)
rm $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi || true
vditool DD $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi $(BIN_DIR)/openwrt-$(BOARD)-ext2.image
VBoxManage convertfromraw -format VDI $(BIN_DIR)/openwrt-$(BOARD)-ext2.image $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi
endif
endef
endif
@ -121,8 +121,8 @@ endef
$(eval $(call BuildImage))
ifeq ($(CONFIG_X86_VDI_IMAGES),y)
$(eval $(call RequireCommand,vditool, \
You need vditool to generate VirtualBox images. \
$(eval $(call RequireCommand,VBoxManage, \
You need VBoxManage to generate VirtualBox images. \
))
endif