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 /target/linux | |
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
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/x86/image/Makefile | 26 |
1 files changed, 10 insertions, 16 deletions
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 |