From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 22 Jul 2024 08:25:46 +0000 (+0200)
Subject: mkosi: Use the Fedora Rawhide spec for CentOS
X-Git-Tag: v257-rc1~855^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebbae3d6328725767e23afef8692596e03f9d3d1;p=thirdparty%2Fsystemd.git

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.
---

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 158b78bd356..682c2f43c74 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 140aae804b2..f3d19e31741 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 0e1a1cd7ef3..0e02dcb642e 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