From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 29 Mar 2024 07:28:57 +0000 (+0100)
Subject: mkosi: Switch to linux-virtual on Ubuntu
X-Git-Tag: v256-rc1~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5cd051724236f95cf9b9ad1f8acd77dc56d0323;p=thirdparty%2Fsystemd.git

mkosi: Switch to linux-virtual on Ubuntu

This now finally has support for credentials and erofs so let's switch
to this much smaller kernel package that doesn't pull in linux-firmware.
---

diff --git a/mkosi.conf b/mkosi.conf
index a5953d76136..cea204961bb 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -19,8 +19,6 @@ BuildSourcesEphemeral=yes
 
 [Host]
 @Incremental=yes
-# TODO: Drop to 2G again once the next Noble kernel update ships and we can use linux-image-virtual.
-@QemuMem=4G
 @RuntimeSize=8G
 ToolsTreePackages=virtiofsd
 KernelCommandLineExtra=systemd.crash_shell
diff --git a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
index 85126a1a37e..957d00e4297 100644
--- a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
@@ -5,7 +5,6 @@ Distribution=ubuntu
 
 [Content]
 Packages=
-        # We would like to use linux-virtual but it does not have support for SMBIOS credentials.
-        linux-image-generic
+        linux-image-virtual
         linux-tools-common
-        linux-tools-generic
+        linux-tools-virtual