base: Add arm64 support

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>

incus-osd/internal/install/install.go

@@ -607,12 +607,20 @@ func copyPartitionDefinition(ctx context.Context, src string, tgt string, partit
 		partitionHexCode = "EF00"
 	case "Linux filesystem":
 		partitionHexCode = "8300"
+
 	case "Linux x86-64 /usr verity signature":
 		partitionHexCode = "8385"
 	case "Linux x86-64 /usr verity":
 		partitionHexCode = "8319"
 	case "Linux x86-64 /usr":
 		partitionHexCode = "8314"
+
+	case "Linux ARM64 /usr verity signature":
+		partitionHexCode = "8375"
+	case "Linux ARM64 /usr verity":
+		partitionHexCode = "831b"
+	case "Linux ARM64 /usr":
+		partitionHexCode = "8316"
 	default:
 		return fmt.Errorf("unrecognized partition type '%s'", partitionType)
 	}

incus-osd/internal/secureboot/secureboot.go

@@ -901,6 +901,12 @@ func getArchEFIFiles() (map[string]string, error) {
 		ret["systemdEFI"] = "/boot/EFI/systemd/systemd-bootx64.efi"
 		ret["bootEFI"] = "/boot/EFI/BOOT/BOOTX64.EFI"
 
+		return ret, nil
+	case "arm64":
+		ret["stub"] = "lib/systemd/boot/efi/systemd-bootaa64.efi.signed"
+		ret["systemdEFI"] = "/boot/EFI/systemd/systemd-bootaa64.efi"
+		ret["bootEFI"] = "/boot/EFI/BOOT/BOOTAA64.EFI"
+
 		return ret, nil
 	default:
 		return ret, fmt.Errorf("architecture %s isn't currently supported", runtime.GOARCH)

incus-osd/internal/systemd/sysupdate.go

@@ -77,7 +77,7 @@ func ApplySystemUpdate(ctx context.Context, luksPassword string, version string,
 	for _, file := range updateFiles {
 		if strings.HasSuffix(file.Name(), "_"+version+".efi") {
 			newUKIFile = filepath.Join(SystemUpdatesPath, file.Name())
-		} else if strings.Contains(file.Name(), "_"+version+".usr-x86-64.") {
+		} else if strings.Contains(file.Name(), "_"+version+".usr-x86-64.") || strings.Contains(file.Name(), "_"+version+".usr-arm64.") {
 			newUsrImageFile = filepath.Join(SystemUpdatesPath, file.Name())
 		}
 	}

incus-osd/internal/util/luks.go

@@ -8,7 +8,7 @@ import (
 )
 
 // GetLUKSVolumePartitions returns the underlying partitions that hold the root and swap LUKS volumes.
-// We can't just rely on /dev/disk/by-partlabel/root-x86-64, because as soon as an overlay is applied
+// We can't just rely on /dev/disk/by-partlabel/root-ARCH, because as soon as an overlay is applied
 // that symlink is repointed to the newly mapped loop device.
 func GetLUKSVolumePartitions() (map[string]string, error) {
 	// /dev/disk/by-partlabel/swap should always point to the correct underlying device.

mkosi.conf

@@ -12,7 +12,6 @@ SplitArtifacts=yes
 [Distribution]
 Distribution=debian
 Release=trixie
-Architecture=x86-64
 Mirror=http://deb.debian.org/debian
 Repositories=non-free-firmware
 

mkosi.images/incus/install.sh

@@ -14,7 +14,6 @@ Types: deb
 URIs: https://pkgs.zabbly.com/incus/stable
 Suites: trixie
 Components: main
-Architectures: amd64
 Signed-By: /etc/apt/keyrings/zabbly.asc
 
 EOF

mkosi.sandbox/etc/apt/sources.list.d/zabbly-incus-stable.sources

@@ -3,5 +3,4 @@ Types: deb
 URIs: https://pkgs.zabbly.com/incus/stable
 Suites: trixie
 Components: main
-Architectures: amd64
 Signed-By: /etc/apt/keyrings/zabbly.asc

mkosi.sandbox/etc/apt/sources.list.d/zabbly-kernel-stable.sources

@@ -3,5 +3,4 @@ Types: deb
 URIs: https://pkgs.zabbly.com/kernel/stable
 Suites: trixie
 Components: main zfs
-Architectures: amd64
 Signed-By: /etc/apt/keyrings/zabbly.asc

mkosi.sandbox/etc/apt/sources.list.d/zabbly-ovn-stable.sources

@@ -3,5 +3,4 @@ Types: deb
 URIs: https://pkgs.zabbly.com/ovn/stable
 Suites: trixie
 Components: main
-Architectures: amd64
 Signed-By: /etc/apt/keyrings/zabbly.asc