Changeset 15201

Timestamp:

2009-04-10T15:34:40+02:00 (9 years ago)

Author:

nico

Message:

merge r13821 to 8.09 (closes: #4582)

Location:

branches/8.09/target/linux/x86/image

Files:

• Config.in (modified) (1 diff)
• Makefile (modified) (2 diffs)

branches/8.09/target/linux/x86/image/Config.in

@@ -37 +37 @@
 
 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

branches/8.09/target/linux/x86/image/Makefile

@@ -67 +67 @@
     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
@@ -111 +111 @@
 
 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