Add aarch64 support to Debian default images

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 6649e10fc5346d74335d888c6ad63f419c4b9ed8..0ca155c0c96292d700cbe64f96e1aea40877dfa8 100644 (file)
--- 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 e9a3b14ad84e2f1631a52a98157eaf6652214a25..a397680bcfe30f7d2316c474dffdf8f9703423d4 100644 (file)
--- 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 (file)
index 0000000..57c275e
--- /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 cd0df3257464b00eea5b056b8c53fe1246a6f52d..14ac8a1522638279efc41a961872b7a1b8cfe346 100644 (file)
--- 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 (file)
index 0000000..af923fa
--- /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 (file)
index 0000000..615de52
--- /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