x86: remove the arbitrary limitation of vmware/virtualbox images to ext4, select TARGET_IMAGES_PAD instead
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 41763
This commit is contained in:
parent
286780b44a
commit
c718d0b10c
2 changed files with 12 additions and 19 deletions
|
@ -229,14 +229,13 @@ menu "Target Images"
|
||||||
bool "Build VirtualBox image files (VDI)"
|
bool "Build VirtualBox image files (VDI)"
|
||||||
depends on TARGET_x86 || TARGET_x86_64
|
depends on TARGET_x86 || TARGET_x86_64
|
||||||
select GRUB_IMAGES
|
select GRUB_IMAGES
|
||||||
select TARGET_ROOTFS_EXT4FS
|
select TARGET_IMAGES_PAD
|
||||||
select PACKAGE_kmod-e1000
|
select PACKAGE_kmod-e1000
|
||||||
|
|
||||||
config VMDK_IMAGES
|
config VMDK_IMAGES
|
||||||
bool "Build VMware image files (VMDK)"
|
bool "Build VMware image files (VMDK)"
|
||||||
depends on TARGET_x86 || TARGET_x86_64
|
depends on TARGET_x86 || TARGET_x86_64
|
||||||
select GRUB_IMAGES
|
select TARGET_IMAGES_PAD
|
||||||
select TARGET_ROOTFS_EXT4FS
|
|
||||||
select PACKAGE_kmod-e1000
|
select PACKAGE_kmod-e1000
|
||||||
|
|
||||||
config TARGET_IMAGES_PAD
|
config TARGET_IMAGES_PAD
|
||||||
|
|
|
@ -160,27 +160,21 @@ endef
|
||||||
|
|
||||||
ifneq ($(CONFIG_VDI_IMAGES),)
|
ifneq ($(CONFIG_VDI_IMAGES),)
|
||||||
define Image/Build/vdi
|
define Image/Build/vdi
|
||||||
# left here because the image builder doesnt need these
|
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
|
||||||
ifeq ($(1),ext4)
|
qemu-img convert -f raw -O vdi \
|
||||||
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||||
qemu-img convert -f raw -O vdi \
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
# XXX: VBoxManage insists on setting perms to 0600
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
chmod 0644 $(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
|
|
||||||
endef
|
endef
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(CONFIG_VMDK_IMAGES),)
|
ifneq ($(CONFIG_VMDK_IMAGES),)
|
||||||
define Image/Build/vmdk
|
define Image/Build/vmdk
|
||||||
# left here because the image builder doesnt need these
|
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
|
||||||
ifeq ($(1),ext4)
|
qemu-img convert -f raw -O vmdk \
|
||||||
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
||||||
qemu-img convert -f raw -O vmdk \
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
|
||||||
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
|
|
||||||
endif
|
|
||||||
endef
|
endef
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue