Changeset 15201


Ignore:
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:
2 edited

Legend:

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

    r11300 r15201  
    3737 
    3838config X86_VDI_IMAGES 
    39     bool "Build VirtualBox image files (VDI). Requires vditool" 
     39    bool "Build VirtualBox image files (VDI). Requires VBoxManage" 
    4040    depends TARGET_x86 
    4141    depends TARGET_ROOTFS_EXT2FS 
  • branches/8.09/target/linux/x86/image/Makefile

    r11599 r15201  
    6767    ifeq ($(1),ext2) 
    6868                rm $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi || true 
    69                 vditool DD $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi $(BIN_DIR)/openwrt-$(BOARD)-ext2.image 
     69                VBoxManage convertfromraw -format VDI $(BIN_DIR)/openwrt-$(BOARD)-ext2.image $(BIN_DIR)/openwrt-$(BOARD)-ext2.vdi 
    7070    endif 
    7171  endef 
     
    111111 
    112112ifeq ($(CONFIG_X86_VDI_IMAGES),y) 
    113   $(eval $(call RequireCommand,vditool, \ 
    114         You need vditool to generate VirtualBox images. \ 
     113  $(eval $(call RequireCommand,VBoxManage, \ 
     114        You need VBoxManage to generate VirtualBox images. \ 
    115115  )) 
    116116endif 
Note: See TracChangeset for help on using the changeset viewer.