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 53a43bc8c9348fab0fdcc87d34b22b2011ecc912..bde44e73bec87ebfe5265bc581b27b4504239fb6 100644 (file)
--- 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 (file)
index 0000000..a94ac4a
--- /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