merge r22553

[x86] image: use internal qemu-img for vmdk and vdi images
drop host dependencies on qemu-utils and VirtualBox

SVN-Revision: 22556

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index a76d8788ae84c730d1b0207e7e612133b63add8a..28d7081642503c98780f5fc7bef7c7871e5b2231 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -35,8 +35,6 @@ config X86_VDI_IMAGES
        depends TARGET_x86_generic
        depends TARGET_ROOTFS_EXT2FS
        select PACKAGE_kmod-pcnet32
-       help
-         Requires VBoxManage installed on the build system.
 
 config X86_VMDK_IMAGES
        bool "Build VMware image files (VMDK)"
@@ -44,8 +42,6 @@ config X86_VMDK_IMAGES
        depends TARGET_x86_generic
        depends TARGET_ROOTFS_EXT2FS
        select PACKAGE_kmod-e1000
-       help
-         Requires qemu-img installed on the build system.
 
 
 config OLPC_BOOTSCRIPT_IMAGES

diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 4ede52051f58fc01ab110951ed1eeb18a5ad5ce9..c38b930ace20e8f0623fa507f4927adcc42c5d86 100644 (file)
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -154,7 +154,7 @@ ifneq ($(CONFIG_X86_VDI_IMAGES),)
     # left here because the image builder doesnt need these
     ifeq ($(1),ext2)
                rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
-               VBoxManage convertfromraw -format VDI \
+               qemu-img convert -f raw -O vdi \
                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
                # XXX: VBoxManage insists on setting perms to 0600
@@ -202,15 +202,3 @@ define Image/Build
 endef
 
 $(eval $(call BuildImage))
-
-ifneq ($(CONFIG_X86_VDI_IMAGES),)
-  $(eval $(call RequireCommand,VBoxManage, \
-       You need VBoxManage to generate VirtualBox images. \
-  ))
-endif
-
-ifneq ($(CONFIG_X86_VMDK_IMAGES),)
-  $(eval $(call RequireCommand,qemu-img, \
-       You need qemu-img to generate VMware images. \
-  ))
-endif