From 5b79e9d7a987f8f2f46ae7f66bb39465958a008c Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Fri, 14 Jul 2023 14:43:19 +0200 Subject: [PATCH] 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. --- .github/workflows/mkosi.yml | 2 +- mkosi.conf.d/10-centos.conf | 2 ++ mkosi.conf.d/11-centos-8/mkosi.conf | 8 -------- .../mkosi.reposdir/CentOS-Stream-Hyperscale.repo | 7 ------- .../11-centos-8/mkosi.reposdir/powertools.repo | 10 ---------- 5 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 mkosi.conf.d/11-centos-8/mkosi.conf delete mode 100644 mkosi.conf.d/11-centos-8/mkosi.reposdir/CentOS-Stream-Hyperscale.repo delete mode 100644 mkosi.conf.d/11-centos-8/mkosi.reposdir/powertools.repo diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 984e6a8e06..2a0f7a9096 100644 --- 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 4181f03414..6932b8b29c 100644 --- 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 index 6b6ab8cccd..0000000000 --- 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 index c520c6f1e8..0000000000 --- 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 index 1462257c08..0000000000 --- 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