From abc5c6d49bd3a6201fd3766545bf297779980691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Deckert?= Date: Fri, 5 Feb 2021 16:35:27 +0100 Subject: [PATCH] allow switching between vmdk images with IDE or SCSI controller --- Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 21a2a0d..20d2972 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ IMAGES = $(VABUILDER_OUTPUT)/images RAW_IMAGE = $(IMAGES)/$(APPLIANCE).img QCOW_IMAGE = $(IMAGES)/$(APPLIANCE).qcow VMDK_IMAGE = $(IMAGES)/$(APPLIANCE).vmdk +VMDK_TYPE = IDE XVA_IMAGE = $(IMAGES)/$(APPLIANCE).xva LST_FILE = $(IMAGES)/$(APPLIANCE)-packages.lst CHECKSUMS = $(IMAGES)/SHA256SUMS @@ -302,7 +303,11 @@ xva: $(XVA_IMAGE) $(VMDK_IMAGE): $(RAW_IMAGE) @print Creating `basename $(VMDK_IMAGE)` +ifeq ($(VMDK_TYPE),SCSI) + qemu-img convert -f raw -O vmdk -o adapter_type=lsilogic,subformat=streamOptimized,compat6 $(RAW_IMAGE) $(VMDK_IMAGE).tmp +else qemu-img convert -f raw -O vmdk $(RAW_IMAGE) $(VMDK_IMAGE).tmp +endif mv $(VMDK_IMAGE).tmp $(VMDK_IMAGE) vmdk: $(VMDK_IMAGE) @@ -390,8 +395,9 @@ help: @echo 'EXTERNAL_KERNEL=YES - Do not build a kernel in the image' @echo 'HEADLESS=YES - Build a headless (serial console) image.' @echo 'ENABLE_SSHD=YES - Enable sshd to start automatically in the image' + @echo 'VMDK_TYPE=IDE - VMDK image type (IDE or SCSI)' @echo - @print 'Example' - @echo 'make APPLIANCE=mongodb HEADLESS=YES VIRTIO=YES stage4 qcow clean' + @print 'Example to build the base appliance' + @echo 'make APPLIANCE=base HEADLESS=YES VIRTIO=YES stage4 qcow clean' .PHONY: qcow vmdk clean realclean distclean stage4 image stage4 help appliance-list eclean sync_portage sync_stage3 checksums