From 2a0a398084190ff37cb6039f714e0655ca594424 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 18 Dec 2023 23:47:54 +0100
Subject: [PATCH] Add aarch64 support to Debian default images

---
 .../20-centos-fedora/mkosi.conf.d/20-x86-64.conf       |  2 ++
 .../mkosi.conf}                                        |  3 ---
 .../20-debian-ubuntu/mkosi.conf.d/20-x86-64.conf       | 10 ++++++++++
 mkosi.conf.d/{20-debian.conf => 20-debian/mkosi.conf}  |  4 ----
 mkosi.conf.d/20-debian/mkosi.conf.d/20-arm64.conf      |  8 ++++++++
 mkosi.conf.d/20-debian/mkosi.conf.d/20-x86-64.conf     |  8 ++++++++
 6 files changed, 28 insertions(+), 7 deletions(-)
 rename mkosi.conf.d/{20-debian-ubuntu.conf => 20-debian-ubuntu/mkosi.conf} (94%)
 create mode 100644 mkosi.conf.d/20-debian-ubuntu/mkosi.conf.d/20-x86-64.conf
 rename mkosi.conf.d/{20-debian.conf => 20-debian/mkosi.conf} (72%)
 create mode 100644 mkosi.conf.d/20-debian/mkosi.conf.d/20-arm64.conf
 create mode 100644 mkosi.conf.d/20-debian/mkosi.conf.d/20-x86-64.conf

diff --git a/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf
index 6649e10fc..0ca155c0c 100644
--- a/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf
+++ b/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
 [Match]
 Architecture=x86-64
 
diff --git a/mkosi.conf.d/20-debian-ubuntu.conf b/mkosi.conf.d/20-debian-ubuntu/mkosi.conf
similarity index 94%
rename from mkosi.conf.d/20-debian-ubuntu.conf
rename to mkosi.conf.d/20-debian-ubuntu/mkosi.conf
index e9a3b14ad..a397680bc 100644
--- a/mkosi.conf.d/20-debian-ubuntu.conf
+++ b/mkosi.conf.d/20-debian-ubuntu/mkosi.conf
@@ -6,7 +6,6 @@ Distribution=|ubuntu
 
 [Content]
 Packages=
-        amd64-microcode
         apt
         archlinux-keyring
         bash
@@ -22,8 +21,6 @@ Packages=
         dosfstools
         e2fsprogs
         erofs-utils
-        grub-pc
-        intel-microcode
         libtss2-dev
         makepkg
         mtools
diff --git a/mkosi.conf.d/20-debian-ubuntu/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/20-debian-ubuntu/mkosi.conf.d/20-x86-64.conf
new file mode 100644
index 000000000..57c275e66
--- /dev/null
+++ b/mkosi.conf.d/20-debian-ubuntu/mkosi.conf.d/20-x86-64.conf
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=x86-64
+
+[Content]
+Packages=
+        amd64-microcode
+        grub-pc
+        intel-microcode
diff --git a/mkosi.conf.d/20-debian.conf b/mkosi.conf.d/20-debian/mkosi.conf
similarity index 72%
rename from mkosi.conf.d/20-debian.conf
rename to mkosi.conf.d/20-debian/mkosi.conf
index cd0df3257..14ac8a152 100644
--- a/mkosi.conf.d/20-debian.conf
+++ b/mkosi.conf.d/20-debian/mkosi.conf
@@ -6,7 +6,3 @@ Distribution=debian
 [Distribution]
 @Release=unstable
 Repositories=non-free-firmware
-
-[Content]
-Packages=
-        linux-image-cloud-amd64
diff --git a/mkosi.conf.d/20-debian/mkosi.conf.d/20-arm64.conf b/mkosi.conf.d/20-debian/mkosi.conf.d/20-arm64.conf
new file mode 100644
index 000000000..af923fa44
--- /dev/null
+++ b/mkosi.conf.d/20-debian/mkosi.conf.d/20-arm64.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=arm64
+
+[Content]
+Packages=
+        linux-image-cloud-arm64
diff --git a/mkosi.conf.d/20-debian/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/20-debian/mkosi.conf.d/20-x86-64.conf
new file mode 100644
index 000000000..615de5249
--- /dev/null
+++ b/mkosi.conf.d/20-debian/mkosi.conf.d/20-x86-64.conf
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Architecture=x86-64
+
+[Content]
+Packages=
+        linux-image-cloud-amd64
-- 
2.47.2