vbox_x86 builds: force-set the vdi UUIDs The VDI UUID is used by VirtualBox to make sure that a disk is not in use by more than one VM at a time. This is a nuisance when you have to rebuild the image constantly, as you have to manually release and re-add the VDI with a new UUID each time before you run the VM. So for now, set the UUID to all As for /dev/sda and all Bs for /dev/sdb to make life easier. Change-Id: I3e36331c25b6f47c2d466556f906b4a11ef53e74 Signed-off-by: Iliyan Malchev <[email protected]>
diff --git a/config.mk b/config.mk index 484271c..ba92246 100644 --- a/config.mk +++ b/config.mk
@@ -240,6 +240,8 @@ virtual_box_manager := VBoxManage # hrd-code the UUID so we don't have to release the disk manually in the VirtualBox manager. virtual_box_manager_options := convertfromraw --format VDI +virtual_box_manager_system_disk_ptions := --uuid "{aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa}" +virtual_box_manager_data_disk_ptions := --uuid "{bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb}" $(INSTALLED_VBOX_INSTALLER_IMAGE_TARGET): $(INSTALLED_DISK_INSTALLER_IMAGE_TARGET) @rm -f $(INSTALLED_VBOX_INSTALLER_IMAGE_TARGET) @@ -253,13 +255,19 @@ INSTALLED_VBOX_SYSTEM_DISK_IMAGE_TARGET := $(PRODUCT_OUT)/android_system_disk.vdi $(INSTALLED_VBOX_SYSTEM_DISK_IMAGE_TARGET): $(INSTALLED_ANDROID_IMAGE_SYSTEM_TARGET) @rm -f $@ - $(hide) $(virtual_box_manager) $(virtual_box_manager_options) $^ $@ + $(hide) $(virtual_box_manager) \ + $(virtual_box_manager_options) \ + $(virtual_box_manager_system_disk_ptions) \ + $^ $@ @echo "Done with VirtualBox bootable system-disk image -[ $@ ]-" INSTALLED_VBOX_DATA_DISK_IMAGE_TARGET := $(PRODUCT_OUT)/android_data_disk.vdi $(INSTALLED_VBOX_DATA_DISK_IMAGE_TARGET): $(INSTALLED_ANDROID_IMAGE_DATA_TARGET) @rm -f $@ - $(hide) $(virtual_box_manager) $(virtual_box_manager_options) $^ $@ + $(hide) $(virtual_box_manager) \ + $(virtual_box_manager_options) \ + $(virtual_box_manager_data_disk_ptions) \ + $^ $@ @echo "Done with VirtualBox bootable data-disk image -[ $@ ]-" .PHONY: installer_img