domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: remove the arbitrary limitation of vmware/virtualbox images to ext4, select TARGET_IMAGES_PAD instead

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 41763
This commit is contained in:
Felix Fietkau
2014-07-20 08:18:50 +00:00
parent 286780b44a
commit c718d0b10c
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/Config-images.in
View File

@@ -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

6
target/linux/x86/image/Makefile
View File

@@ -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
ifeq ($(1),ext4)
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
qemu-img convert -f raw -O vdi \ qemu-img convert -f raw -O vdi \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
# XXX: VBoxManage insists on setting perms to 0600 # XXX: VBoxManage insists on setting perms to 0600
chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi 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
ifeq ($(1),ext4)
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
qemu-img convert -f raw -O vmdk \ qemu-img convert -f raw -O vmdk \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
endif
endef endef
endif endif