From: Jörg Behrmann <behrmann@physik.fu-berlin.de>
Date: Wed, 2 Oct 2024 11:07:02 +0000 (+0200)
Subject: tools: Don't use apt pattern for ubuntu-keyring
X-Git-Tag: v25~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aefea656b930f859e1d069c1acfe93886fff9c4d;p=thirdparty%2Fmkosi.git

tools: Don't use apt pattern for ubuntu-keyring

Running

    mkosi --directory "" -d debian -r bookworm --include mkosi-tools --output mkosi.tools

on current Debian stable on gets an error that the package 'ubuntu-keyring'
doesn't have any installable candidates. Moving the inclusion of the package
out of the purview of apt and back into mkosi's fixes this issue.
---

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
index 53a43bc8c..bde44e73b 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf
@@ -13,7 +13,6 @@ Packages=
         ?exact-name(systemd-boot)
         ?exact-name(systemd-repart)
         ?exact-name(systemd-ukify)
-        ?exact-name(ubuntu-keyring)
         ?exact-name(virtiofsd)
         apt
         archlinux-keyring
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/ubuntu-keyring.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/ubuntu-keyring.conf
new file mode 100644
index 000000000..a94ac4ab4
--- /dev/null
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/ubuntu-keyring.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=|!debian
+Release=|!bookworm
+
+[Content]
+Packages=
+        ubuntu-keyring