From 08197abb15081752db71fa967524cb76c56803c1 Mon Sep 17 00:00:00 2001 From: DaanDeMeyer Date: Fri, 11 Jul 2025 09:48:29 +0200 Subject: [PATCH] mkosi: Fix installation conditions for rpmautospec-rpm-macros rpmautospec-rpm-macros is only in EPEL 9 so let's gate it properly on that by splitting up the epel packages config file into two. erofs-utils is in EPEL 9 and in CentOS Stream 10. --- .../mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf | 11 +++++++++++ ...epel-packages.conf => rpmautospec-rpm-macros.conf} | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf rename mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/{epel-packages.conf => rpmautospec-rpm-macros.conf} (57%) diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf b/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf new file mode 100644 index 00000000000..ef45d2ad1cf --- /dev/null +++ b/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/erofs-utils.conf @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[TriggerMatch] +Repositories=epel +Release=9 + +[TriggerMatch] +Release=10 + +[Content] +Packages=erofs-utils diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf b/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/rpmautospec-rpm-macros.conf similarity index 57% rename from mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf rename to mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/rpmautospec-rpm-macros.conf index 15849c51452..6a67165b938 100644 --- a/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/epel-packages.conf +++ b/mkosi/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf.d/rpmautospec-rpm-macros.conf @@ -2,8 +2,7 @@ [Match] Repositories=epel +Release=9 [Content] -Packages= - erofs-utils - rpmautospec-rpm-macros +Packages=rpmautospec-rpm-macros -- 2.47.3