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.

diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
index 30f5789c6b3293d3b816e96bef525922eb324c53..9f64fca42e37edfc5f83a97232338591dbee22c6 100644 (file)
--- 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 (file)
index 0000000..c4f6859
--- /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 (file)
index 0000000..e46e118
--- /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 (file)
index 0000000..a65670a
--- /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 4fa99163521a57928c0138c8f6b7d91a90554a08..ab5a925247ae042ce50a76cc8807a51a7761c943 100644 (file)
--- 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=