Changeset 22553


Ignore:
Timestamp:
2010-08-09T06:22:39+02:00 (6 years ago)
Author:
agb
Message:

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

Location:
trunk/target/linux/x86/image
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/x86/image/Config.in

    r21365 r22553  
    3737        depends TARGET_ROOTFS_EXT2FS 
    3838        select PACKAGE_kmod-pcnet32 
    39         help 
    40           Requires VBoxManage installed on the build system. 
    4139 
    4240config X86_VMDK_IMAGES 
     
    4644        depends TARGET_ROOTFS_EXT2FS 
    4745        select PACKAGE_kmod-e1000 
    48         help 
    49           Requires qemu-img installed on the build system. 
    5046 
    5147 
  • trunk/target/linux/x86/image/Makefile

    r21609 r22553  
    144144    ifeq ($(1),ext2) 
    145145                rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true 
    146                 VBoxManage convertfromraw -format VDI \ 
     146                qemu-img convert -f raw -O vdi \ 
    147147                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ 
    148148                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi 
     
    192192 
    193193$(eval $(call BuildImage)) 
    194  
    195 ifneq ($(CONFIG_X86_VDI_IMAGES),) 
    196   $(eval $(call RequireCommand,VBoxManage, \ 
    197         You need VBoxManage to generate VirtualBox images. \ 
    198   )) 
    199 endif 
    200  
    201 ifneq ($(CONFIG_X86_VMDK_IMAGES),) 
    202   $(eval $(call RequireCommand,qemu-img, \ 
    203         You need qemu-img to generate VMware images. \ 
    204   )) 
    205 endif 
Note: See TracChangeset for help on using the changeset viewer.