From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 3 Jan 2024 21:14:31 +0000 (+0100)
Subject: Allow building default ubuntu image for jammy
X-Git-Tag: v20~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b71deeba585b84f2eb362b70a45cbd22fd756a4d;p=thirdparty%2Fmkosi.git

Allow building default ubuntu image for jammy

Useful for debugging CI failures since CI also runs jammy.

We also make sure the shared configuration is included after the
distribution specific configuration so we can set defaults in the
distribution specific configuration and use it in the shared
configuration.
---

diff --git a/mkosi.conf b/mkosi.conf
index 3973bd7ca..0d4017153 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -25,7 +25,7 @@ Packages=
         libtool
         make
         nano
-        pkg-config
+        pkgconf
         strace
 
 InitrdPackages=
diff --git a/mkosi.conf.d/20-ubuntu.conf b/mkosi.conf.d/20-ubuntu/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/20-ubuntu.conf
rename to mkosi.conf.d/20-ubuntu/mkosi.conf
diff --git a/mkosi.conf.d/20-ubuntu/mkosi.conf.d/20-jammy.conf b/mkosi.conf.d/20-ubuntu/mkosi.conf.d/20-jammy.conf
new file mode 100644
index 000000000..2909ba72f
--- /dev/null
+++ b/mkosi.conf.d/20-ubuntu/mkosi.conf.d/20-jammy.conf
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=jammy
+
+[Distribution]
+PackageManagerTrees=mkosi.pkgmngr
diff --git a/mkosi.conf.d/20-ubuntu/mkosi.pkgmngr/etc/apt/sources.list.d/kernel-utils.sources b/mkosi.conf.d/20-ubuntu/mkosi.pkgmngr/etc/apt/sources.list.d/kernel-utils.sources
new file mode 100644
index 000000000..c79e0c46d
--- /dev/null
+++ b/mkosi.conf.d/20-ubuntu/mkosi.pkgmngr/etc/apt/sources.list.d/kernel-utils.sources
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+Enabled: yes
+Types: deb
+URIs: https://ppa.launchpadcontent.net/michel-slm/kernel-utils/ubuntu
+Suites: jammy
+Components: main
+Signed-By:
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ .
+ xsFNBGJyEb0BEADR6CoHmzotr+Z1UmqkNQZ/z+tm4u3/KbjD/UKHOloAJK2L2Mf6
+ Eq1hbs2MlEYa7VtYcfq+NqluvTtqHckgE6sTFGbxQXMUDK+bcxqXmQUQcRw/Wytl
+ BgRr6fCA+pK82W6Z5eFyYsfbZMqnIqw3rbtx02K43KFGOiP8Pj/FFcPXzf9q3+3k
+ EXELs8y6N7OEYeloEs45RnBwkKETvMX08zbTZfn5owfYZRd4VpIZJ2BnZprzdzfP
+ Z1ZTkkDTAUpZvpXFi5WtDx6rVP92+7OYxOjUKzQ9wFbKdkZVzqhfJIR2SHM2tHVz
+ GwIZl6vYsAqLLZccQSS4nBCXIzUwRO28LwqzacjKabl197fk0C/IKFw2Z4/ZsCHb
+ VcrnttD3G1AvQ+DMvEPTzB9vD4R7uNEkmg4UYokzk6yW9/KQm3lNbQBS+D5jZREv
+ hRyz4ZLW9wzz13H655nXzJCIZvLWVpRLNzQDscxYlkYBONoH+HiGafsgZqw+ITc3
+ tDPTw0HqRNe+/oendXqOhtKhY2PRhD3vu5NgXLX7GuAHr7Dq9HMUyA5MxKH90e28
+ vaYUmwU0jfYGgNnSCpRrAOx0SlqKpMlwW9VkpJctGrYMZ/ts6yPdJC2OSWiJRlMa
+ Xmf4IvsLrCGobd27y03TYl5Uq6OOpD0DSP2hGZQxYHOgMhhZxT99IJUlMwARAQAB
+ zShMYXVuY2hwYWQgUFBBIGZvciBNaWNoZWwgQWxleGFuZHJlIFNhbGltwsGOBBMB
+ CgA4FiEE+8ojhpUuuImlrBJjySgIhqCuA8oFAmJyEb0CGwMFCwkIBwIGFQoJCAsC
+ BBYCAwECHgECF4AACgkQySgIhqCuA8orpw//YWpifbMc2F3zNx8oW2UyTsr2IXtu
+ 4/pHVtDroYokMOvCy2IR6FhzXSMM35yQBVfn92T5MiG0pHqXNUIZstt/m3Qo7tnj
+ 1AR9f0mRLTKHONQCUP91CiVHGGKfaYHiyQ9Pxxp+LUxFkoEXUfQPl6N0wfGCd0Rb
+ k9gcFlOo3+duOFsd+1Aw3Gi83SFcl6Bc4P/3i+dfB4g1Nbte0ZzPnFWKKYRV0K6z
+ 5uDbJJYdIS+nwIxVXb7cnMUrrHBr4cUDsIXnAwVN+zeK7Q4CrJOpR6ZDGNb5SGcO
+ TaJPEOpCIcIKkzW9IzYm5NTzxhQHg7jvCPrGBuX3nTt1fEzCn5L2se9iwehtsMat
+ WXwi+yIYlpce2vHRPZEb8ILMoCL50veAAZ2tAlHx9UnAPNtT+1PPzrKPcIVCAB2e
+ fBgUBcCaQ62LWsIQX1B9qL4xhGX7Z4nFk2aXNlrHjnnf5gwFCJ/XiVuFgGetfRrV
+ r2PgfFFOfUanJ4LMu8sfqurrNJXrYMHfA8+qIbTLyltlqsOiEROOa/Qje5KEqmbe
+ vg/hbqRpGNHdYKP1OynqBK8VAgG9/g5qGR8FLXr1DXl5dzlqyiIkRQINd9O6XjnX
+ LWPl1wsOXOCY/jWgMxktt8Mv9qaaZ4CT9cuwsm/aml270A3GKRYHLDFP3CkuMnqd
+ 0vsZgWMIQtgQmXU=
+ =7vwW
+ -----END PGP PUBLIC KEY BLOCK-----
diff --git a/mkosi.conf.d/20-centos-fedora/mkosi.conf b/mkosi.conf.d/30-centos-fedora/mkosi.conf
similarity index 100%
rename from mkosi.conf.d/20-centos-fedora/mkosi.conf
rename to mkosi.conf.d/30-centos-fedora/mkosi.conf
diff --git a/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-uefi.conf b/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-uefi.conf
similarity index 100%
rename from mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-uefi.conf
rename to mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-uefi.conf
diff --git a/mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-x86-64.conf
similarity index 100%
rename from mkosi.conf.d/20-centos-fedora/mkosi.conf.d/20-x86-64.conf
rename to mkosi.conf.d/30-centos-fedora/mkosi.conf.d/20-x86-64.conf
diff --git a/mkosi.conf.d/20-debian-ubuntu/mkosi.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
similarity index 95%
rename from mkosi.conf.d/20-debian-ubuntu/mkosi.conf
rename to mkosi.conf.d/30-debian-ubuntu/mkosi.conf
index eb0d6a309..0cc913730 100644
--- a/mkosi.conf.d/20-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
@@ -43,10 +43,8 @@ Packages=
         strace
         swtpm
         systemd
-        systemd-boot
         systemd-container
         systemd-coredump
-        systemd-resolved
         systemd-sysv
         tar
         tzdata
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
new file mode 100644
index 000000000..4fa991635
--- /dev/null
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Release=!jammy
+
+[Content]
+Packages=
+        systemd-boot
+        systemd-resolved
diff --git a/mkosi.conf.d/20-debian-ubuntu/mkosi.conf.d/20-x86-64.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-x86-64.conf
similarity index 100%
rename from mkosi.conf.d/20-debian-ubuntu/mkosi.conf.d/20-x86-64.conf
rename to mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-x86-64.conf