mkosi: Update to latest

mkosi now supports CentOS SIGs natively so we drop our own definition
of that and use the mkosi builtin one. We also enable hyperscale for
both CentOS 8 and CentOS 9 for consistency and add epel-next as well
which is a requirement for Hyperscale.

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index 984e6a8e0662b59ad40509bcd00930031dafa7ef..2a0f7a90965119a1c8d5e3810929fc27e9e8ac7d 100644 (file)
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -76,7 +76,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-    - uses: systemd/mkosi@b1a570550ee077ed7a9a9359e4732636034807e6
+    - uses: systemd/mkosi@5866c0ff3b36d350c943016e5a3b115f7a95d37f
 
     - name: Configure
       run: |

diff --git a/mkosi.conf.d/10-centos.conf b/mkosi.conf.d/10-centos.conf
index 4181f03414bf4ce02a9dd32451dd069c6cc3813b..6932b8b29cd941b311dd56b03d4fcec7951a8ee1 100644 (file)
--- a/mkosi.conf.d/10-centos.conf
+++ b/mkosi.conf.d/10-centos.conf
@@ -6,3 +6,5 @@ Distribution=centos
 [Distribution]
 Release=9
 Repositories=epel
+             epel-next
+             hyperscale-packages-main

diff --git a/mkosi.conf.d/11-centos-8/mkosi.conf b/mkosi.conf.d/11-centos-8/mkosi.conf
deleted file mode 100644 (file)
index 6b6ab8c..0000000
--- a/mkosi.conf.d/11-centos-8/mkosi.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=centos
-Release=8
-
-[Distribution]
-PackageManagerTrees=mkosi.reposdir:/etc/yum.repos.d

diff --git a/mkosi.conf.d/11-centos-8/mkosi.reposdir/CentOS-Stream-Hyperscale.repo b/mkosi.conf.d/11-centos-8/mkosi.reposdir/CentOS-Stream-Hyperscale.repo
deleted file mode 100644 (file)
index c520c6f..0000000
--- a/mkosi.conf.d/11-centos-8/mkosi.reposdir/CentOS-Stream-Hyperscale.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[centos-hyperscale]
-name=CentOS Stream $releasever - Hyperscale
-mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=hyperscale-packages-main
-#baseurl=http://mirror.centos.org/$contentdir/$stream/hyperscale/$basearch/packages-main/
-gpgcheck=1
-enabled=1
-gpgkey=https://git.centos.org/rpms/centos-release-hyperscale/raw/c8s-sig-hyperscale/f/SOURCES/RPM-GPG-KEY-CentOS-SIG-HyperScale

diff --git a/mkosi.conf.d/11-centos-8/mkosi.reposdir/powertools.repo b/mkosi.conf.d/11-centos-8/mkosi.reposdir/powertools.repo
deleted file mode 100644 (file)
index 1462257..0000000
--- a/mkosi.conf.d/11-centos-8/mkosi.reposdir/powertools.repo
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[powertools-hotfixes]
-name=powertools-hotfixes
-mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools
-gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official
-gpgcheck=1
-enabled=1
-module_hotfixes=1
-skip_if_unavailable=1