From ebbae3d6328725767e23afef8692596e03f9d3d1 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 22 Jul 2024 10:25:46 +0200 Subject: [PATCH] mkosi: Use the Fedora Rawhide spec for CentOS These are now practically identical, with the only differences between the two having no effect on the rpm builds we do with mkosi, so let's cut out the middle man and just use the Fedora Rawhide spec for CentOS as well. --- mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf | 6 ++++++ mkosi.images/build/mkosi.conf.d/centos/mkosi.conf | 6 ------ mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf index 158b78bd35..682c2f43c7 100644 --- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf @@ -5,6 +5,12 @@ Distribution=|centos Distribution=|fedora [Content] +Environment= + GIT_URL=https://src.fedoraproject.org/rpms/systemd.git + GIT_BRANCH=rawhide + GIT_COMMIT=a3524fc837f5e7b68f86b3e0a9d470a94a04c4c8 + PKG_SUBDIR=fedora + Packages= compiler-rt git-core diff --git a/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf index 140aae804b..f3d19e3174 100644 --- a/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/centos/mkosi.conf @@ -7,9 +7,3 @@ Distribution=centos Packages= rsync # TODO: Drop when CentOS Stream 9 CI is removed. squashfs-tools - -Environment= - GIT_URL=https://git.centos.org/rpms/systemd.git - GIT_BRANCH=c10s-sig-hyperscale - GIT_COMMIT=46480aaa9e0ea63a85b6ca676554ce2aae10ce36 - PKG_SUBDIR=centos diff --git a/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf index 0e1a1cd7ef..0e02dcb642 100644 --- a/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/fedora/mkosi.conf @@ -4,12 +4,6 @@ Distribution=fedora [Content] -Environment= - GIT_URL=https://src.fedoraproject.org/rpms/systemd.git - GIT_BRANCH=rawhide - GIT_COMMIT=a3524fc837f5e7b68f86b3e0a9d470a94a04c4c8 - PKG_SUBDIR=fedora - Packages= erofs-utils rpmautospec -- 2.25.1