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 d296d70f9e39da39141796ed5f5f6d34758029ec..17e911af4d5fa60274653ee1bc94f83ff2abf5e9 100644 (file)
--- 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 ddf78da0b0c9e37ed807a420b4cf03244038083e..695bc20e1eb31fcda6bde9070ac14a7923024eb5 100644 (file)
--- 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