From d2c0acaf707ded59e7b22809d6dd4fe25dfdeb21 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 18 Apr 2024 13:27:43 +0200
Subject: [PATCH] mkosi: Install more packages

Let's install everything we can to get more coverage and make sure
all build outputs are available in mkosi containers or VMs.
---
 .../mkosi.conf.d/10-centos-fedora/mkosi.conf  | 17 +++++++-------
 .../mkosi.conf.d/10-debian-ubuntu/mkosi.conf  | 23 +++++++++++++------
 .../mkosi.conf.d/10-opensuse/mkosi.conf       |  7 ++++--
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
index 23704276ff..4344b51fa0 100644
--- a/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -7,17 +7,18 @@ Distribution=|fedora
 [Content]
 VolatilePackages=
         systemd
-        systemd-udev
-        systemd-container
-        systemd-resolved
-        systemd-networkd
         systemd-boot
-        systemd-tests
-        systemd-ukify
-        systemd-pam
-        systemd-oomd-defaults
+        systemd-container
+        systemd-devel
         systemd-journal-remote
+        systemd-networkd
         systemd-networkd-defaults
+        systemd-oomd-defaults
+        systemd-pam
+        systemd-resolved
+        systemd-tests
+        systemd-udev
+        systemd-ukify
 
 Packages=
         bpftool
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 7ece67705a..7144d73f10 100644
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -6,19 +6,28 @@ Distribution=|ubuntu
 
 [Content]
 VolatilePackages=
+        libnss-myhostname
+        libnss-mymachines
+        libnss-resolve
+        libnss-systemd
+        libpam-systemd
+        libsystemd-dev
+        libudev-dev
         systemd
-        systemd-userdbd
+        systemd-boot
+        systemd-boot-efi
+        systemd-container
+        systemd-coredump
+        systemd-dev
+        systemd-homed
+        systemd-journal-remote
         systemd-oomd
+        systemd-resolved
         systemd-sysv
         systemd-tests
         systemd-timesyncd
-        systemd-resolved
-        systemd-homed
-        systemd-coredump
-        systemd-journal-remote
-        systemd-container
-        systemd-boot
         systemd-ukify
+        systemd-userdbd
         udev
 
 Packages=
diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
index 24d69ccc27..dbc6f945af 100644
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -9,15 +9,18 @@ InitrdInclude=initrd/
 [Content]
 VolatilePackages=
         systemd
-        udev
-        systemd-experimental
         systemd-boot
         systemd-container
+        systemd-devel
+        systemd-doc
+        systemd-experimental
         systemd-homed
+        systemd-lang
         systemd-network
         systemd-portable
         systemd-sysvcompat
         systemd-testsuite
+        udev
 
 # We install gawk, gzip, grep, xz, sed, rsync and docbook-xsl-stylesheets here explicitly so that the busybox
 # versions don't get installed instead.