Improve ARM64 Silicon OS X and Ubuntu ARM64 support for VMWare Fusion

CHANGELOG.md

@@ -52,6 +52,8 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#>
 
 ## [unreleased] (2023-03-16)
 
+- Updated VMware disk and cdrom adaptor type to sata for aarch64 build compatability
+
 ## [v3.0.0] (2023-03-16)
 
 - fixed pipeline secrets issue for github api requests and secrets not working for forked repos

os_pkrvars/ubuntu/ubuntu-20.04-aarch64.pkrvars.hcl

@@ -6,5 +6,5 @@ iso_checksum            = "sha256:e42d6373dd39173094af5c26cbf2497770426f42049f8b
 hyperv_generation       = 2
 parallels_guest_os_type = "ubuntu"
 vbox_guest_os_type      = "Ubuntu_64"
-vmware_guest_os_type    = "ubuntu-64"
+vmware_guest_os_type    = "arm-ubuntu-64"
 boot_command            = ["<wait><esc>linux /casper/vmlinuz quiet autoinstall ds='nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/'<enter>initrd /casper/initrd<enter>boot<enter>"]

os_pkrvars/ubuntu/ubuntu-22.04-aarch64.pkrvars.hcl

@@ -6,5 +6,5 @@ iso_checksum            = "file:https://cdimage.ubuntu.com/releases/22.04/releas
 hyperv_generation       = 2
 parallels_guest_os_type = "ubuntu"
 vbox_guest_os_type      = "Ubuntu_64"
-vmware_guest_os_type    = "ubuntu-64"
+vmware_guest_os_type    = "arm-ubuntu-64"
 boot_command            = ["<wait>e<wait><down><down><down><end><wait> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<f10><wait>"]

os_pkrvars/ubuntu/ubuntu-22.10-aarch64.pkrvars.hcl

@@ -6,5 +6,5 @@ iso_checksum            = "a19d956e993a16fc6496c371e36dcc0eb85d2bdf6a8e86028b92c
 hyperv_generation       = 2
 parallels_guest_os_type = "ubuntu"
 vbox_guest_os_type      = "Ubuntu_64"
-vmware_guest_os_type    = "ubuntu-64"
+vmware_guest_os_type    = "arm-ubuntu-64"
 boot_command            = ["<wait>e<wait><down><down><down><end> autoinstall ds=nocloud-net\\;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/<wait><f10><wait>"]

packer_templates/pkr-sources.pkr.hcl

@@ -64,11 +64,6 @@ locals {
     var.os_name == "amazonlinux" ? "${path.root}/amz_working_files/amazon2.ovf" : null
   ) : var.vbox_source
 
-  # vmware-iso
-  vmware_disk_adapter_type = var.vmware_disk_adapter_type == null ? (
-    var.is_windows ? "lsisas1068" : null
-  ) : var.vmware_disk_adapter_type
-
   # Source block common
   boot_wait = var.boot_wait == null ? (
     var.is_windows ? "60s" : "10s"
@@ -245,8 +240,9 @@ source "virtualbox-ovf" "amazonlinux" {
   vm_name                 = local.vm_name
 }
 source "vmware-iso" "vm" {
+  cdrom_adapter_type             = var.vmware_cdrom_adapter_type
+  disk_adapter_type              = var.vmware_disk_adapter_type
   guest_os_type                  = var.vmware_guest_os_type
-  disk_adapter_type              = local.vmware_disk_adapter_type
   tools_upload_flavor            = var.vmware_tools_upload_flavor
   tools_upload_path              = var.vmware_tools_upload_path
   version                        = var.vmware_version

packer_templates/pkr-variables.pkr.hcl

@@ -175,9 +175,15 @@ variable "vbox_source" {
 }
 
 # vmware-iso
+variable "vmware_cdrom_adapter_type" {
+  type        = string
+  default     = "sata"
+  description = "CDROM adapter type.  Needs to be SATA (or non-SCSI) for ARM64 builds."
+}
 variable "vmware_disk_adapter_type" {
-  type    = string
-  default = null
+  type        = string
+  default     = "sata"
+  description = "Disk adapter type.  Needs to be SATA (PVSCSI, or non-SCSI) for ARM64 builds."
 }
 variable "vmware_guest_os_type" {
   type        = string