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.

(cherry picked from commit ebbae3d6328725767e23afef8692596e03f9d3d1)

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 158b78bd356195c01500bae5d0e03872782345aa..682c2f43c74a8ad1240ab06e4f4e2e7ebb1063d9 100644 (file)
--- 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 140aae804b2b0ca63af18c6e4ed829b7066dab56..f3d19e31741551f5014299c0915f97570f38a3f3 100644 (file)
--- 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 0e1a1cd7ef3689025e18ff41fe78632c21f7e45c..0e02dcb642e8cd27415f2fd22fdc0d10a42c0a9e 100644 (file)
--- 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