From: Nicolas Thill <nico@openwrt.org>
Date: Fri, 10 Apr 2009 13:34:40 +0000 (+0000)
Subject: merge r13821 to 8.09 (closes: #4582)
X-Git-Tag: 8.09.1~119
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8ab585e5ac676190cd0327411266f39f9733c2d0;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r13821 to 8.09 (closes: #4582)

SVN-Revision: 15201
---

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 04ceef0ab8..5706e44640 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -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
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index d707d2f435..9980cf0152 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -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
@@ -110,8 +110,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