mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 06:08:08 +00:00
image: use internal qemu-img for vmdk and vdi images drop host dependencies on qemu-utils and VirtualBox
SVN-Revision: 22553
This commit is contained in:
parent
ff43518669
commit
0f5d0f69ab
@ -36,8 +36,6 @@ config X86_VDI_IMAGES
|
|||||||
depends TARGET_x86_generic
|
depends TARGET_x86_generic
|
||||||
depends TARGET_ROOTFS_EXT2FS
|
depends TARGET_ROOTFS_EXT2FS
|
||||||
select PACKAGE_kmod-pcnet32
|
select PACKAGE_kmod-pcnet32
|
||||||
help
|
|
||||||
Requires VBoxManage installed on the build system.
|
|
||||||
|
|
||||||
config X86_VMDK_IMAGES
|
config X86_VMDK_IMAGES
|
||||||
bool "Build VMware image files (VMDK)"
|
bool "Build VMware image files (VMDK)"
|
||||||
@ -45,8 +43,6 @@ config X86_VMDK_IMAGES
|
|||||||
depends TARGET_x86_generic
|
depends TARGET_x86_generic
|
||||||
depends TARGET_ROOTFS_EXT2FS
|
depends TARGET_ROOTFS_EXT2FS
|
||||||
select PACKAGE_kmod-e1000
|
select PACKAGE_kmod-e1000
|
||||||
help
|
|
||||||
Requires qemu-img installed on the build system.
|
|
||||||
|
|
||||||
|
|
||||||
config OLPC_BOOTSCRIPT_IMAGES
|
config OLPC_BOOTSCRIPT_IMAGES
|
||||||
|
@ -143,7 +143,7 @@ ifneq ($(CONFIG_X86_VDI_IMAGES),)
|
|||||||
# left here because the image builder doesnt need these
|
# left here because the image builder doesnt need these
|
||||||
ifeq ($(1),ext2)
|
ifeq ($(1),ext2)
|
||||||
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
|
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
|
||||||
VBoxManage convertfromraw -format 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
|
||||||
@ -191,15 +191,3 @@ define Image/Build
|
|||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildImage))
|
$(eval $(call BuildImage))
|
||||||
|
|
||||||
ifneq ($(CONFIG_X86_VDI_IMAGES),)
|
|
||||||
$(eval $(call RequireCommand,VBoxManage, \
|
|
||||||
You need VBoxManage to generate VirtualBox images. \
|
|
||||||
))
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(CONFIG_X86_VMDK_IMAGES),)
|
|
||||||
$(eval $(call RequireCommand,qemu-img, \
|
|
||||||
You need qemu-img to generate VMware images. \
|
|
||||||
))
|
|
||||||
endif
|
|
||||||
|
Loading…
Reference in New Issue
Block a user