Author: nbd Date: 2014-07-20 10:18:50 +0200 (Sun, 20 Jul 2014) New Revision: 41763
Modified: trunk/config/Config-images.in trunk/target/linux/x86/image/Makefile Log: x86: remove the arbitrary limitation of vmware/virtualbox images to ext4, select TARGET_IMAGES_PAD instead Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/config/Config-images.in =================================================================== --- trunk/config/Config-images.in 2014-07-19 20:14:49 UTC (rev 41762) +++ trunk/config/Config-images.in 2014-07-20 08:18:50 UTC (rev 41763) @@ -229,14 +229,13 @@ bool "Build VirtualBox image files (VDI)" depends on TARGET_x86 || TARGET_x86_64 select GRUB_IMAGES - select TARGET_ROOTFS_EXT4FS + select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 config VMDK_IMAGES bool "Build VMware image files (VMDK)" depends on TARGET_x86 || TARGET_x86_64 - select GRUB_IMAGES - select TARGET_ROOTFS_EXT4FS + select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 config TARGET_IMAGES_PAD Modified: trunk/target/linux/x86/image/Makefile =================================================================== --- trunk/target/linux/x86/image/Makefile 2014-07-19 20:14:49 UTC (rev 41762) +++ trunk/target/linux/x86/image/Makefile 2014-07-20 08:18:50 UTC (rev 41763) @@ -160,27 +160,21 @@ ifneq ($(CONFIG_VDI_IMAGES),) define Image/Build/vdi - # left here because the image builder doesnt need these - ifeq ($(1),ext4) - rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true - 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 - chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi - endif + rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true + 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 + chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi endef endif ifneq ($(CONFIG_VMDK_IMAGES),) define Image/Build/vmdk - # left here because the image builder doesnt need these - ifeq ($(1),ext4) - rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true - qemu-img convert -f raw -O vmdk \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk - endif + rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true + qemu-img convert -f raw -O vmdk \ + $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ + $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk endef endif _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
