Changeset 22556


Ignore:
Timestamp:
2010-08-09T06:44:42+02:00 (7 years ago)
Author:
agb
Message:

[backfire] merge r22553

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

Location:
branches/backfire/target/linux/x86/image
Files:
2 edited

Legend:

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

    r21476 r22556  
    3636        depends TARGET_ROOTFS_EXT2FS 
    3737        select PACKAGE_kmod-pcnet32 
    38         help 
    39           Requires VBoxManage installed on the build system. 
    4038 
    4139config X86_VMDK_IMAGES 
     
    4543        depends TARGET_ROOTFS_EXT2FS 
    4644        select PACKAGE_kmod-e1000 
    47         help 
    48           Requires qemu-img installed on the build system. 
    4945 
    5046 
  • branches/backfire/target/linux/x86/image/Makefile

    r21476 r22556  
    155155    ifeq ($(1),ext2) 
    156156                rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true 
    157                 VBoxManage convertfromraw -format VDI \ 
     157                qemu-img convert -f raw -O vdi \ 
    158158                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ 
    159159                        $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi 
     
    203203 
    204204$(eval $(call BuildImage)) 
    205  
    206 ifneq ($(CONFIG_X86_VDI_IMAGES),) 
    207   $(eval $(call RequireCommand,VBoxManage, \ 
    208         You need VBoxManage to generate VirtualBox images. \ 
    209   )) 
    210 endif 
    211  
    212 ifneq ($(CONFIG_X86_VMDK_IMAGES),) 
    213   $(eval $(call RequireCommand,qemu-img, \ 
    214         You need qemu-img to generate VMware images. \ 
    215   )) 
    216 endif 
Note: See TracChangeset for help on using the changeset viewer.