From 49505e481d5f6b8f62aed41d4d4b7f801a869ecf Mon Sep 17 00:00:00 2001
From: Chris Novakovic <chris@chrisn.me.uk>
Date: Thu, 13 Nov 2025 13:16:24 +0000
Subject: [PATCH] Only build FreeBSD 14.3 x86-64 image

Please only supports the x86-64 architecture for FreeBSD. Remove the
arm64 image configurations, and only build an x86-64 image for the
latest stable FreeBSD release (currently 14.3).
---
 .github/workflows/build.yml       | 32 -------------------------------
 readme.md                         |  4 ++++
 var_files/12.2/x86-64.pkrvars.hcl |  1 -
 var_files/12.4/arm64.pkrvars.hcl  |  1 -
 var_files/12.4/x86-64.pkrvars.hcl |  1 -
 var_files/13.0/arm64.pkrvars.hcl  |  1 -
 var_files/13.0/x86-64.pkrvars.hcl |  1 -
 var_files/13.1/arm64.pkrvars.hcl  |  1 -
 var_files/13.1/x86-64.pkrvars.hcl |  1 -
 var_files/13.2/arm64.pkrvars.hcl  |  1 -
 var_files/13.2/x86-64.pkrvars.hcl |  1 -
 var_files/13.3/arm64.pkrvars.hcl  |  1 -
 var_files/13.3/x86-64.pkrvars.hcl |  1 -
 var_files/13.4/arm64.pkrvars.hcl  |  1 -
 var_files/13.4/x86-64.pkrvars.hcl |  1 -
 var_files/13.5/arm64.pkrvars.hcl  |  1 -
 var_files/13.5/x86-64.pkrvars.hcl |  1 -
 var_files/14.0/arm64.pkrvars.hcl  |  1 -
 var_files/14.0/x86-64.pkrvars.hcl |  1 -
 var_files/14.1/arm64.pkrvars.hcl  |  1 -
 var_files/14.1/x86-64.pkrvars.hcl |  1 -
 var_files/14.2/arm64.pkrvars.hcl  |  1 -
 var_files/14.2/x86-64.pkrvars.hcl |  1 -
 var_files/14.3/arm64.pkrvars.hcl  |  1 -
 var_files/arm64.pkrvars.hcl       |  8 --------
 25 files changed, 4 insertions(+), 62 deletions(-)
 delete mode 100644 var_files/12.2/x86-64.pkrvars.hcl
 delete mode 100644 var_files/12.4/arm64.pkrvars.hcl
 delete mode 100644 var_files/12.4/x86-64.pkrvars.hcl
 delete mode 100644 var_files/13.0/arm64.pkrvars.hcl
 delete mode 100644 var_files/13.0/x86-64.pkrvars.hcl
 delete mode 100644 var_files/13.1/arm64.pkrvars.hcl
 delete mode 100644 var_files/13.1/x86-64.pkrvars.hcl
 delete mode 100644 var_files/13.2/arm64.pkrvars.hcl
 delete mode 100644 var_files/13.2/x86-64.pkrvars.hcl
 delete mode 100644 var_files/13.3/arm64.pkrvars.hcl
 delete mode 100644 var_files/13.3/x86-64.pkrvars.hcl
 delete mode 100644 var_files/13.4/arm64.pkrvars.hcl
 delete mode 100644 var_files/13.4/x86-64.pkrvars.hcl
 delete mode 100644 var_files/13.5/arm64.pkrvars.hcl
 delete mode 100644 var_files/13.5/x86-64.pkrvars.hcl
 delete mode 100644 var_files/14.0/arm64.pkrvars.hcl
 delete mode 100644 var_files/14.0/x86-64.pkrvars.hcl
 delete mode 100644 var_files/14.1/arm64.pkrvars.hcl
 delete mode 100644 var_files/14.1/x86-64.pkrvars.hcl
 delete mode 100644 var_files/14.2/arm64.pkrvars.hcl
 delete mode 100644 var_files/14.2/x86-64.pkrvars.hcl
 delete mode 100644 var_files/14.3/arm64.pkrvars.hcl
 delete mode 100644 var_files/arm64.pkrvars.hcl

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc0bb56..8a2f11f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,16 +18,6 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '12.2'
-          - '13.0'
-          - '13.1'
-          - '13.2'
-          - '13.3'
-          - '13.4'
-          - '13.5'
-          - '14.0'
-          - '14.1'
-          - '14.2'
           - '14.3'
 
         architecture:
@@ -35,28 +25,6 @@ jobs:
             qemu: x86
             uname: amd64
 
-          - name: arm64
-            qemu: aarch64
-
-        exclude:
-          - version: '12.2'
-            architecture:
-              name: arm64
-              qemu: aarch64
-
-        include:
-          - version: '12.4'
-            copy_from_previous_release: true
-            architecture:
-              name: arm64
-              qemu: aarch64
-
-          - version: '12.4'
-            architecture:
-              name: x86-64
-              qemu: x86
-              uname: amd64
-
     steps:
       - name: Clone Repository
         uses: actions/checkout@v4
diff --git a/readme.md b/readme.md
index 3d62876..770268f 100644
--- a/readme.md
+++ b/readme.md
@@ -3,3 +3,7 @@
 This is a fork of [cross-platform-actions/freebsd-builder](https://github.com/cross-platform-actions/freebsd-builder)
 with customisations to meet the needs of various [Please](https://please.build) build and test processes. It is not
 guaranteed to be useful for any other purpose.
+
+## Changes to upstream
+
+* Only the FreeBSD 14.3 x86-64 image is built.
diff --git a/var_files/12.2/x86-64.pkrvars.hcl b/var_files/12.2/x86-64.pkrvars.hcl
deleted file mode 100644
index ea2d286..0000000
--- a/var_files/12.2/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:bc997989eafb41fcabd6ed55e379134c7322425391d1cd0e5eff37759fc7f865"
diff --git a/var_files/12.4/arm64.pkrvars.hcl b/var_files/12.4/arm64.pkrvars.hcl
deleted file mode 100644
index cfec18e..0000000
--- a/var_files/12.4/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:b20afd320d5a15394c376077a93f57b3433455d274047d90d7447b6f356789b1"
diff --git a/var_files/12.4/x86-64.pkrvars.hcl b/var_files/12.4/x86-64.pkrvars.hcl
deleted file mode 100644
index 88074ec..0000000
--- a/var_files/12.4/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:f889113f4cb0dc50b443b3e5753861cfda1b6c08beb0c9bfc6b212572f19dc9f"
diff --git a/var_files/13.0/arm64.pkrvars.hcl b/var_files/13.0/arm64.pkrvars.hcl
deleted file mode 100644
index f9c5f00..0000000
--- a/var_files/13.0/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:870c5eadbc1a0055392142432b54779328097b8e286266ca9124705c5bfa329a"
diff --git a/var_files/13.0/x86-64.pkrvars.hcl b/var_files/13.0/x86-64.pkrvars.hcl
deleted file mode 100644
index 2c0467d..0000000
--- a/var_files/13.0/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:d3df1818c0b90ae8d4c88c447dd158c3c3a3ddada4171ac7b0fe55baa040c821"
diff --git a/var_files/13.1/arm64.pkrvars.hcl b/var_files/13.1/arm64.pkrvars.hcl
deleted file mode 100644
index 64bacd1..0000000
--- a/var_files/13.1/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:40c2c6ad0292f19553677de5afdf3570a2d2e9cbf51b075824cefbddd22787b6"
diff --git a/var_files/13.1/x86-64.pkrvars.hcl b/var_files/13.1/x86-64.pkrvars.hcl
deleted file mode 100644
index 4bb8680..0000000
--- a/var_files/13.1/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:5b29c2cd5a604ad24810c994027ec13c9efc53778a307831f6181dfdaf02939f"
diff --git a/var_files/13.2/arm64.pkrvars.hcl b/var_files/13.2/arm64.pkrvars.hcl
deleted file mode 100644
index 7b7dae0..0000000
--- a/var_files/13.2/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:a76faf6d534222455d82685f8d916fbdcde56f16030817c84e58b96e77a18253"
diff --git a/var_files/13.2/x86-64.pkrvars.hcl b/var_files/13.2/x86-64.pkrvars.hcl
deleted file mode 100644
index 935e769..0000000
--- a/var_files/13.2/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:6b1159a204fd614410d32b15993416c745917e6de1781aa608e53d8c6b3d24a4"
diff --git a/var_files/13.3/arm64.pkrvars.hcl b/var_files/13.3/arm64.pkrvars.hcl
deleted file mode 100644
index 551f9d7..0000000
--- a/var_files/13.3/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:937ff722278a23305a4f9b6924059459b60a46679bddf39f4a2d7251aa914bbf"
diff --git a/var_files/13.3/x86-64.pkrvars.hcl b/var_files/13.3/x86-64.pkrvars.hcl
deleted file mode 100644
index 53af115..0000000
--- a/var_files/13.3/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:4064f704baadf204ab4f75dda987e717b8da252840675ee5feef8f5be7e9356c"
diff --git a/var_files/13.4/arm64.pkrvars.hcl b/var_files/13.4/arm64.pkrvars.hcl
deleted file mode 100644
index 7f2b3a1..0000000
--- a/var_files/13.4/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:cb52b91a85ed3dec6b8a29c7c1687028cd4d322d37fbfe58b45c6c6bb4b65722"
diff --git a/var_files/13.4/x86-64.pkrvars.hcl b/var_files/13.4/x86-64.pkrvars.hcl
deleted file mode 100644
index 31efb71..0000000
--- a/var_files/13.4/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:26cb85a60fdede0e6f4a55e9ff100cc2eb70af24ab1f8a3b2ef5cc1dea152608"
diff --git a/var_files/13.5/arm64.pkrvars.hcl b/var_files/13.5/arm64.pkrvars.hcl
deleted file mode 100644
index 7aad55f..0000000
--- a/var_files/13.5/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:38c3e1e0df76275fcb2f822a14bca05e39e5da62956c01fefa2d473609a31933"
diff --git a/var_files/13.5/x86-64.pkrvars.hcl b/var_files/13.5/x86-64.pkrvars.hcl
deleted file mode 100644
index c878cb1..0000000
--- a/var_files/13.5/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:257fb8a37919dd98d84fb83f9630d242f1cff5509a07179d93db5fec5d9cafea"
diff --git a/var_files/14.0/arm64.pkrvars.hcl b/var_files/14.0/arm64.pkrvars.hcl
deleted file mode 100644
index bb3a6d9..0000000
--- a/var_files/14.0/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:ab4c311aae56d5ec6edacd5a3951b6df1e9bfa94f964e1548c23ad058803c825"
diff --git a/var_files/14.0/x86-64.pkrvars.hcl b/var_files/14.0/x86-64.pkrvars.hcl
deleted file mode 100644
index 5ba5cee..0000000
--- a/var_files/14.0/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:de4fa9d7d199051860b80b84fbae51279a5ff5d92a2729a52bf0a3f79a5feb99"
diff --git a/var_files/14.1/arm64.pkrvars.hcl b/var_files/14.1/arm64.pkrvars.hcl
deleted file mode 100644
index 60b8fc7..0000000
--- a/var_files/14.1/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:1b018ce07d230ed4e074ec38a57616c42dc41c9c016b0add33199d58a930f874"
diff --git a/var_files/14.1/x86-64.pkrvars.hcl b/var_files/14.1/x86-64.pkrvars.hcl
deleted file mode 100644
index ea80ea6..0000000
--- a/var_files/14.1/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:af86ef41bf5e374d0d1022bb45a9541b400756eedcda1eb241a8fc0a3ed59ef1"
diff --git a/var_files/14.2/arm64.pkrvars.hcl b/var_files/14.2/arm64.pkrvars.hcl
deleted file mode 100644
index ec31b01..0000000
--- a/var_files/14.2/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:1b0cc5ec5d17359c0183f47e5fc82938ac24f49af76f1b4539ef4d0606a79bf9"
diff --git a/var_files/14.2/x86-64.pkrvars.hcl b/var_files/14.2/x86-64.pkrvars.hcl
deleted file mode 100644
index 73db5cf..0000000
--- a/var_files/14.2/x86-64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:b158612828166e5fb7b34a76718387b0ed40ef425cfdb88a067aa349713dcae4"
diff --git a/var_files/14.3/arm64.pkrvars.hcl b/var_files/14.3/arm64.pkrvars.hcl
deleted file mode 100644
index b039700..0000000
--- a/var_files/14.3/arm64.pkrvars.hcl
+++ /dev/null
@@ -1 +0,0 @@
-checksum = "sha256:1c41fdca8fcd8c746eb05f31a82a4bff2ad866c5fde1808f16b822a6df3f0de5"
diff --git a/var_files/arm64.pkrvars.hcl b/var_files/arm64.pkrvars.hcl
deleted file mode 100644
index 31dabf2..0000000
--- a/var_files/arm64.pkrvars.hcl
+++ /dev/null
@@ -1,8 +0,0 @@
-architecture = "arm64"
-image_architecture = "arm64-aarch64"
-qemu_architecture = "aarch64"
-pkg_site_architecture = "aarch64"
-machine_type = "virt,highmem=off" // highmem=off if reqiured for enabling hardware acceleration on Apple Silicon
-cpu_type = "cortex-a57"
-firmware = "edk2-aarch64-code.fd"
-memory = 3072 // max memory when hardware acceleration on Apple Silicon is enabled