From 5f90c9e10c263df79bfe9fe4d1e0d76d0d1706d5 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 13 Feb 2024 16:06:31 +0100
Subject: [PATCH] Add Ubuntu Focal support to default image

We install fewer packages that are not available on Focal and make
sure to configure repart to disable an ext4 default feature that
isn't supported by the Jammy and Focal kernels.
---
 mkosi.conf.d/30-debian-ubuntu/mkosi.conf           |  6 ------
 .../mkosi.conf.d/20-ext4-orphan-file.conf          | 11 +++++++++++
 .../30-debian-ubuntu/mkosi.conf.d/20-focal.conf    |  9 +++++++++
 .../mkosi.conf.d/20-not-focal.conf                 | 14 ++++++++++++++
 .../mkosi.conf.d/20-systemd-extra.conf             |  1 +
 5 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-ext4-orphan-file.conf
 create mode 100644 mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-focal.conf
 create mode 100644 mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf

diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
index 30f5789c6..9f64fca42 100644
--- a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
@@ -8,7 +8,6 @@ Distribution=|ubuntu
 Packages=
         ?exact-name(systemd-ukify)
         apt
-        archlinux-keyring
         bash
         btrfs-progs
         bubblewrap
@@ -16,22 +15,18 @@ Packages=
         coreutils
         cpio
         curl
-        dbus-broker
         debian-archive-keyring
-        dnf
         dosfstools
         e2fsprogs
         erofs-utils
         iproute2
         iputils-ping
         libtss2-dev
-        makepkg
         mtools
         openssh-client
         openssh-server
         openssl
         ovmf
-        pacman-package-manager
         pesign
         python3-cryptography
         python3-pefile
@@ -42,7 +37,6 @@ Packages=
         socat
         squashfs-tools
         strace
-        swtpm
         systemd
         systemd-container
         systemd-coredump
diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-ext4-orphan-file.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-ext4-orphan-file.conf
new file mode 100644
index 000000000..c4f6859d6
--- /dev/null
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-ext4-orphan-file.conf
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=ubuntu
+Release=|focal
+Release=|jammy
+
+[Content]
+# "orphan_file" is enabled by default in recent versions of mkfs.ext4 but not supported by the Jammy/Focal kernels
+# so we explicitly disable it.
+Environment=SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-focal.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-focal.conf
new file mode 100644
index 000000000..e46e11874
--- /dev/null
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-focal.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=ubuntu
+Release=focal
+
+[Content]
+Packages=
+        dbus
diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
new file mode 100644
index 000000000..a65670a82
--- /dev/null
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-not-focal.conf
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|!ubuntu
+Release=|!focal
+
+[Content]
+Packages=
+        archlinux-keyring
+        dbus-broker
+        dnf
+        makepkg
+        pacman-package-manager
+        swtpm
diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf
index 4fa991635..ab5a92524 100644
--- a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf
@@ -2,6 +2,7 @@
 
 [Match]
 Release=!jammy
+Release=!focal
 
 [Content]
 Packages=
-- 
2.47.2