Changeset 17780


Ignore:
Timestamp:
2009-09-28T13:22:09+02:00 (8 years ago)
Author:
nico
Message:

[8.09] x86: merge r13158

Location:
branches/8.09/target/linux/x86
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/target/linux/x86/Makefile

    r16039 r17780  
    1010BOARD:=x86 
    1111BOARDNAME:=x86 
    12 FEATURES:=squashfs jffs2 ext2 vdi 
     12FEATURES:=squashfs jffs2 ext2 vdi vmdk 
    1313SUBTARGETS=generic 
    1414 
  • branches/8.09/target/linux/x86/image/Config.in

    r15201 r17780  
    4343    select PACKAGE_kmod-pcnet32 
    4444 
    45  
     45config X86_VMDK_IMAGES 
     46    bool "Build VMware image files (VMDK). Requires qemu-img" 
     47    depends TARGET_x86 
     48    depends TARGET_ROOTFS_EXT2FS 
     49    depends X86_GRUB_IMAGES 
     50    select PACKAGE_kmod-e1000 
  • branches/8.09/target/linux/x86/image/Makefile

    r15201 r17780  
    7272endif 
    7373 
     74ifeq ($(CONFIG_X86_VMDK_IMAGES),y) 
     75  define Image/Build/vmdk 
     76    # left here because the image builder doesnt need these 
     77    ifeq ($(1),ext2) 
     78                rm $(BIN_DIR)/openwrt-$(BOARD)-ext2.vmdk || true 
     79                qemu-img convert -f raw $(BIN_DIR)/openwrt-$(BOARD)-ext2.image \ 
     80                        -O vmdk $(BIN_DIR)/openwrt-$(BOARD)-ext2.vmdk 
     81    endif 
     82  endef 
     83endif 
    7484 
    7585define Image/Prepare 
     
    104114        $(call Image/Build/grub,$(1)) 
    105115        $(call Image/Build/vdi,$(1)) 
     116        $(call Image/Build/vmdk,$(1)) 
    106117        $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(1).fs 
    107118        $(CP) $(KDIR)/bzImage $(BIN_DIR)/openwrt-$(BOARD)-vmlinuz 
     
    116127endif 
    117128 
     129ifeq ($(CONFIG_X86_VMDK_IMAGES),y) 
     130   $(eval $(call RequireCommand,qemu-img, \ 
     131        You need qemu-img to generate VMware images. \ 
     132   )) 
     133endif 
Note: See TracChangeset for help on using the changeset viewer.