From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 21 Dec 2023 15:22:25 +0000 (+0100)
Subject: Add ubu-keyring to CentOS/Fedora default tools trees
X-Git-Tag: v20~43^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=723381ef4747288847481edebd3f7f158a29b125;p=thirdparty%2Fmkosi.git

Add ubu-keyring to CentOS/Fedora default tools trees

And remove the CI exclusions related to missing ubuntu keyring in
CentOS/Fedora.
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d296d70f9..17e911af4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -125,11 +125,6 @@ jobs:
             tools: centos
           - distro: debian
             tools: debian
-          # Fedora and CentOS don't package ubuntu-keyring.
-          - distro: ubuntu
-            tools: centos
-          - distro: ubuntu
-            tools: fedora
           # rpm in Debian is currently missing
           # https://github.com/rpm-software-management/rpm/commit/ea3187cfcf9cac87e5bc5e7db79b0338da9e355e
           - distro: fedora
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf
index ddf78da0b..695bc20e1 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-centos-fedora/mkosi.conf
@@ -21,4 +21,5 @@ Packages=
         squashfs-tools
         systemd-container
         systemd-udev
+        ubu-keyring
         xz