diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-20 08:18:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-20 08:18:50 +0000 |
| commit | 72c3ea603f426208fdb29ed3f31a66b8621f036f (patch) | |
| tree | 5816d85a5ae9efbc79c68abce8ecf9185beae72e | |
| parent | 876ef9b7fd57c6a855d6b480ed7117c7cbdd195b (diff) | |
| download | master-187ad058-72c3ea603f426208fdb29ed3f31a66b8621f036f.tar.gz master-187ad058-72c3ea603f426208fdb29ed3f31a66b8621f036f.tar.bz2 master-187ad058-72c3ea603f426208fdb29ed3f31a66b8621f036f.zip | |
x86: remove the arbitrary limitation of vmware/virtualbox images to ext4, select TARGET_IMAGES_PAD instead
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41763 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | config/Config-images.in | 5 | ||||
| -rw-r--r-- | target/linux/x86/image/Makefile | 26 |
2 files changed, 12 insertions, 19 deletions
diff --git a/config/Config-images.in b/config/Config-images.in index 9aeebc11f8..2231b600a9 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -229,14 +229,13 @@ menu "Target Images" 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 diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 03aa350da2..59837180f1 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -160,27 +160,21 @@ endef 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 |