From 1e26418cd10dd140ac8c3730582ba67c7c0474a1 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 16:23:37 +0100 Subject: [PATCH 1/7] Branch f34 from rawhide Signed-off-by: Tomas Hrcka --- fedora-modular.repo | 2 +- fedora-rawhide-modular.repo | 2 +- fedora-rawhide.repo | 2 +- fedora-repos.spec | 6 +++++- fedora-updates-modular.repo | 2 +- fedora-updates-testing-modular.repo | 2 +- fedora-updates-testing.repo | 2 +- fedora-updates.repo | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/fedora-modular.repo b/fedora-modular.repo index 5aa9c26..1ecdf6f 100644 --- a/fedora-modular.repo +++ b/fedora-modular.repo @@ -2,7 +2,7 @@ name=Fedora Modular $releasever - $basearch #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=0 +enabled=1 countme=1 #metadata_expire=7d repo_gpgcheck=0 diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo index 5646313..68fd3ae 100644 --- a/fedora-rawhide-modular.repo +++ b/fedora-rawhide-modular.repo @@ -23,7 +23,7 @@ name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch -enabled=1 +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo index 2e649e6..5bed85b 100644 --- a/fedora-rawhide.repo +++ b/fedora-rawhide.repo @@ -23,7 +23,7 @@ name=Fedora - Rawhide - Developmental packages for the next Fedora release #baseurl=http://download.example/pub/fedora/linux/development/rawhide//Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -enabled=1 +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 diff --git a/fedora-repos.spec b/fedora-repos.spec index 63e0f32..4a9d3c0 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -3,7 +3,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 34 -Release: 0.10%{?eln:.eln%{eln}} +Release: 0.11%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -236,6 +236,10 @@ done %changelog +* Tue Feb 09 2021 Tomas Hrcka - 34-0.11 +- Disable rawhide repos +- Enable fedora, updates, updates-testing repos + * Tue Feb 09 2021 Mohan Boddu - 34-0.10 - Fixing archmap for F35 diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo index 37e4b71..bcfc886 100644 --- a/fedora-updates-modular.repo +++ b/fedora-updates-modular.repo @@ -2,7 +2,7 @@ name=Fedora Modular $releasever - $basearch - Updates #baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch -enabled=0 +enabled=1 countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo index 5cd78af..6e39b26 100644 --- a/fedora-updates-testing-modular.repo +++ b/fedora-updates-testing-modular.repo @@ -2,7 +2,7 @@ name=Fedora Modular $releasever - $basearch - Test Updates #baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch -enabled=0 +enabled=1 countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 9306abb..837355c 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch - Test Updates #baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=0 +enabled=1 countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora-updates.repo b/fedora-updates.repo index 9992c83..9d9f2fd 100644 --- a/fedora-updates.repo +++ b/fedora-updates.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch - Updates #baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -enabled=0 +enabled=1 countme=1 repo_gpgcheck=0 type=rpm From dc30ab5f3ff8790918d3b50ce2e57b97836613db Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 9 Feb 2021 22:41:09 +0100 Subject: [PATCH 2/7] Fix %check section for branched release Signed-off-by: Tomas Hrcka --- fedora-repos.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 4a9d3c0..86fe964 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,9 +1,9 @@ -%global rawhide_release 34 +%global rawhide_release 35 Summary: Fedora package repositories Name: fedora-repos Version: 34 -Release: 0.11%{?eln:.eln%{eln}} +Release: 0.12%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -190,7 +190,7 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %check # assert all rawhide/eln repos are set to enabled only when this is rawhide -for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do %if %{rawhide_release} == %{version} grep 'enabled=1' $repo %else @@ -236,6 +236,9 @@ done %changelog +* Tue Feb 09 2021 Tomas Hrcka - 34-0.12 +- Fixing test + * Tue Feb 09 2021 Tomas Hrcka - 34-0.11 - Disable rawhide repos - Enable fedora, updates, updates-testing repos From 08819dbf9428d57eedbe5cd978b516f995bb8b6a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 11 Feb 2021 16:21:23 -0800 Subject: [PATCH 3/7] Actually enable the fedora repo thrcka inadvertently left it disabled. --- fedora-repos.spec | 5 ++++- fedora.repo | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 86fe964..b324444 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -3,7 +3,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 34 -Release: 0.12%{?eln:.eln%{eln}} +Release: 0.13%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -236,6 +236,9 @@ done %changelog +* Thu Feb 11 2021 Adam Williamson - 34-0.13 +- Actually enable fedora repo + * Tue Feb 09 2021 Tomas Hrcka - 34-0.12 - Fixing test diff --git a/fedora.repo b/fedora.repo index b39369e..12a8e11 100644 --- a/fedora.repo +++ b/fedora.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -enabled=0 +enabled=1 countme=1 #metadata_expire=7d repo_gpgcheck=0 From 227a364fb95a9dc989dcafcc91a46d668da65f87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Mon, 22 Feb 2021 17:02:54 +0100 Subject: [PATCH 4/7] sync changes from Rawhide Most importantly the RPM-GPG-KEY-fedora-rawhide-primary symlink. Also disable the ELN repo. This was forgotten during F34 branching. --- RPM-GPG-KEY-fedora-36-primary | 29 ++++++++++++++++++ archmap | 7 +++-- fedora-eln.repo | 7 ++--- fedora-repos.spec | 56 +++++++++++++++++++++++++++++++---- 4 files changed, 88 insertions(+), 11 deletions(-) create mode 100644 RPM-GPG-KEY-fedora-36-primary diff --git a/RPM-GPG-KEY-fedora-36-primary b/RPM-GPG-KEY-fedora-36-primary new file mode 100644 index 0000000..3b1b19b --- /dev/null +++ b/RPM-GPG-KEY-fedora-36-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGAkKwgBEAC+IQKqp/BI1VIvRRqcnRoAxkzsY3pxIS1L+C4gaWjIMf1eBBTq +v9eKd4xHsW80VL/tl81WZWO/7JXKmgHODiXrv4HmDIOo6Z1hxehjVRF3Ih4+sKHR +XCJgwcdJnMfqTKnHiycQggeDuheWbfjV2Fgmvxy0jh0M5PCB5taNz41LmPOaUQmn +PXcI05CjP5msKjRBObw5Cd2oad60pTNhnBWRf288S8W4wH4jNISOZLZTOf6HU5gJ +w9wU9RZoaz8kZPNArlJjZsN83S0XLCxpa6UUgYdzPDHOWGtcWGs3bvNAlTYuacun +oICOvTH/ZJU7mgaZbbdSPVLDJdLBKRVgHbdTAK0J913FEiU93GJR5bf/W5FMN7DV +6hsJVMiY/knJmkTFE9whDSjEc0TAYhQuC1HnzvMPGJvkeEz9nRqna5QUuo7V6LI4 +fZNTSlqFyIi/Oa3ZoliOyOshxJmU3y1HaNcHerO1nFbTtZ7s/TKBhY9oFq4T4gJV +yFWy33p/JDxOtlVjpHEkzwXGdPe6R4xK8xHObEVraOMZMaweII+tMOGwVbxZu2kC +A1aflM+oeyU1Fx9qqM0+dYyHO+kp3M5UtfM006RcNcdfoGrA4l6z9sUnHKsYzOLP +RvKkzxiX3T91vHtRGCXjPOgOsJJzjkFtE1a5oFZg39fC99HZdbX0rUqAtQARAQAB +tDFGZWRvcmEgKDM2KSA8ZmVkb3JhLTM2LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJOBBMBCAA4FiEEU97Sy5Iti42eY/0YmZ98vzircfQFAmAkKwgCGw8FCwkI +BwIGFQoJCAsCBBYCAwECHgECF4AACgkQmZ98vzircfSGaxAAlDBWuY1Ch3YsssGE +uaeOuaHmDj08p08WUAFUPBN0ID+0pmRQjywFzrufw8Z2g/lHwic+tpXXr/RtMmcl ++WzLh1E34TRqEngjDJ27QBq1Jyid3h1manKLhZhJ8b1usKHP7Dqh7n+eMTv2Qgrt +6MrCNe4otWZ9WJ5vp/Bay5yAtU6lNoWBmJ+6BS1/2mg2jhoXrfg/Vey+/i6nYZIk +M4IcYCyGCi9rjc8NMgkCyzPkPJtsy2taB+VdUcZyjFpc1acmC8sR/2/SEl4+pOtM +UzW+OUOQFrerX/8MC5LqvmtsiPMyRDCOw3reJTXyoUIehoHoK9QtAdIRRP2nAkPy +GKycVzsLbtheJXUZharXL1DwOkpMNlm3hp9BxX89m7dLblMSjtrQPs8CkpAExAQW +FBltsD73ZhGnfE/XdWp7343m1w5W2m85/rczP+2et+c+HPmYTgaJTu8fAF0FoTDd +uD1r9DxRa2oN3YBiPP/nXnhJaH//GgF/RRw7Fbc66fCh8DTrMsPgmyi/O3/pdSGe +k0UqEfSdzNPbl7gVFlCbr4Ur5n1ph+sEZqOhMuyszLZZvYvUrHsDuanML5X25coP +h+rqyjHJJeYlS2tMAQB1fmHB0LWhRhKYaOROAXFmUutFUxVVoigNCl8mV561DCz6 +6/zy81ZGeyUGOEIZ1NFuoY0EhC8= +=KaIq +-----END PGP PUBLIC KEY BLOCK----- diff --git a/archmap b/archmap index e80ecbd..63d86ce 100644 --- a/archmap +++ b/archmap @@ -1,8 +1,10 @@ fedora-7-primary: i386 x86_64 ppc ppc64 fedora-8-primary: i386 x86_64 ppc ppc64 +fedora-8-primary-original: fedora-9-primary: i386 x86_64 ppc ppc64 +fedora-9-primary-original: fedora-9-secondary: ia64 fedora-10-primary: i386 x86_64 ppc ppc64 @@ -19,7 +21,7 @@ fedora-13-secondary: arm mips fedora-14-primary: i386 x86_64 fedora-14-secondary: arm -fedora-15-primary: i386 x86_64 +fedora-15-primary: i386 x86_64 fedora-15-secondary: arm armhfp ppc ppc64 s390 s390x fedora-16-primary: i386 x86_64 @@ -60,6 +62,7 @@ fedora-27-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x fedora-28-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x +fedora-modularity: fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x @@ -75,4 +78,4 @@ fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x fedora-35-primary: x86_64 armhfp aarch64 ppc64le s390x -fedora-eln-primary: i386 x86_64 aarch64 ppc64le s390x +fedora-36-primary: x86_64 armhfp aarch64 ppc64le s390x diff --git a/fedora-eln.repo b/fedora-eln.repo index c81fbe4..933486d 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -11,7 +11,7 @@ # testing and troubleshooting for development packages in conjunction # with new test releases. # -# More information is available at http://fedoraproject.org/wiki/Testing +# More information is available at http://fedoraproject.org/wiki/Testing # # Reproducible and reportable issues should be filed at # http://bugzilla.redhat.com/. @@ -22,7 +22,7 @@ name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=1 +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -59,7 +59,7 @@ skip_if_unavailable=False name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=1 +enabled=0 countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -89,4 +89,3 @@ type=rpm gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=False - diff --git a/fedora-repos.spec b/fedora-repos.spec index b324444..e0d9cba 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -3,7 +3,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 34 -Release: 0.13%{?eln:.eln%{eln}} +Release: 0.14%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -72,6 +72,10 @@ Source52: RPM-GPG-KEY-fedora-32-primary Source53: RPM-GPG-KEY-fedora-33-primary Source54: RPM-GPG-KEY-fedora-34-primary Source55: RPM-GPG-KEY-fedora-35-primary +Source56: RPM-GPG-KEY-fedora-36-primary +# When bumping Rawhide to fN, create N+1 key (and update archmap). (This +# ensures users have the next future key installed and referenced, even if they +# don't update very often. This will smooth out Rawhide N->N+1 transition for them). Source100: fedora-modular.repo Source101: fedora-updates-modular.repo @@ -162,12 +166,18 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ # says "fedora-19-primary: i386 x86_64", # RPM-GPG-KEY-fedora-19-{i386,x86_64} will be symlinked to that key. pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ -# Also add a symlink for ELN keys +# Also add a symlink for Rawhide and ELN keys +ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-rawhide-primary ln -s RPM-GPG-KEY-fedora-%{rawhide_release}-primary RPM-GPG-KEY-fedora-eln-primary for keyfile in RPM-GPG-KEY*; do - key=${keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary' - arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) \ - || echo "WARNING: no archmap entry for $key" + # resolve symlinks, so that we don't need to keep duplicate entries in archmap + real_keyfile=$(basename $(readlink -f $keyfile)) + key=${real_keyfile#RPM-GPG-KEY-} # e.g. 'fedora-20-primary' + if ! grep -q "^${key}:" %{_sourcedir}/archmap; then + echo "ERROR: no archmap entry for $key" + exit 1 + fi + arches=$(sed -ne "s/^${key}://p" %{_sourcedir}/archmap) for arch in $arches; do # replace last part with $arch (fedora-20-primary -> fedora-20-$arch) ln -s $keyfile ${keyfile%%-*}-$arch # NOTE: RPM replaces %% with % @@ -177,6 +187,17 @@ done ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora popd +# Adjust Rawhide repo files to include Rawhide+1 GPG key. +# This is necessary for the period when Rawhide gets bumped to N+1 and packages +# start to be signed with a newer key. Without having the key specified in the +# repo file, the system would consider the new packages as untrusted. +rawhide_next=$((%{rawhide_release}+1)) +for repo in %{_sourcedir}/fedora-rawhide*.repo; do + sed -ir "s@^gpgkey=.*@& file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \ + $repo || exit 1 +done + +# Install repo files install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d for file in %{_sourcedir}/fedora*repo ; do install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d @@ -198,6 +219,28 @@ for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do %endif done +# make sure the Rawhide+1 key wasn't forgotten to be created +rawhide_next=$((%{rawhide_release}+1)) +if ! test -f $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-primary; then + echo "ERROR: GPG key for Fedora ${rawhide_next} is not present" + exit 1 +fi + +# make sure the Rawhide+1 key is present in Rawhide repo files +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do + gpg_lines=$(grep '^gpgkey=' $repo) + if test -z "$gpg_lines"; then + echo "ERROR: No gpgkey= lines in $repo" + exit 1 + fi + while IFS= read -r line; do + if ! echo "$line" | grep -q "RPM-GPG-KEY-fedora-${rawhide_next}"; then + echo "ERROR: Fedora ${rawhide_next} GPG key missing in $repo" + exit 1 + fi + done <<< "$gpg_lines" +done + %files %dir /etc/yum.repos.d @@ -236,6 +279,9 @@ done %changelog +* Mon Feb 22 2021 Kamil Páral - 34-0.14 +- Sync changes from Rawhide (the rawhide gpg symlink), disable ELN repo + * Thu Feb 11 2021 Adam Williamson - 34-0.13 - Actually enable fedora repo From a4b16e3960156221d62f2eb7751d487edb356b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Tue, 23 Feb 2021 15:05:55 +0100 Subject: [PATCH 5/7] fully automate repository changes This is a cherry-picked commit 1db958c4fbd16ec from the rawhide branch. The purpose is to have repo updates automation in *all* branches, so that we can massively simplify Releng's SOP docs. (If this doesn't get pushed to all branches, the SOPs need to document both versions). The original commit description is below: ---- Instead of performing error-prone manual changes in .repo files several times per cycle, this patchset brings fully automated handling of such edits. All the releng person needs to do is to set `rawhide_release` and `updates_testing_enabled` variables (and of course adjust `Version` and `Release`), and all the repos will be auto-magically populated with the correct values during build (which includes `enabled=0/1` and `metadata_expire=6h/7d`). The intention is to avoid human errors which inevitably happen (an example [1]). This means: * Rawhide/ELN repo files will get enabled for Rawhide builds, disabled otherwise. * Standard repo files will get enabled for non-Rawhide builds, disabled otherwise. * Updates-testing repo will get enabled per specified configuration (ignored on Rawhide). * Base repo files will have short metadata expiration during development period ("Branched"), long expiration during stable period. Everything is covered with tests, to prevent humans and automatons from doing mistakes. That covers the automated changes to repo files, but also e.g. ensuring that updates-testing is not enabled in a Final release by mistake. Coupled with this changeset is an adjustment to certain repo files to make sure all the sections defined in a single repo file have the same value `metadata_expire=`, as it makes sense. And also in the spec file the rawhide subpackage description was moved next to the subpackage definition, they were split by mistake in the past, it seems. If this gets merged, it will massively simplify Releng's Mass Branching SOP in the future [2]. [1] https://src.fedoraproject.org/rpms/fedora-repos/c/08819dbf9428d57eedbe5cd978b516f995bb8b6a?branch=f34 [2] https://docs.pagure.org/releng/sop_mass_branching.html#fedora-repos --- fedora-eln.repo | 9 +- fedora-modular.repo | 8 +- fedora-rawhide-modular.repo | 13 +-- fedora-rawhide.repo | 13 +-- fedora-repos.spec | 127 ++++++++++++++++++++++++---- fedora-updates-modular.repo | 2 +- fedora-updates-testing-modular.repo | 2 +- fedora-updates-testing.repo | 2 +- fedora-updates.repo | 2 +- fedora.repo | 8 +- 10 files changed, 142 insertions(+), 44 deletions(-) diff --git a/fedora-eln.repo b/fedora-eln.repo index 933486d..c6b7f44 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -18,11 +18,12 @@ # # Product: Fedora # Version: eln + [eln-baseos] name=Fedora - ELN BaseOS - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=0 +enabled=AUTO_VALUE countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -36,6 +37,7 @@ name=Fedora - ELN BaseOS - Debug baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/$basearch/debug/tree #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch enabled=0 +metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 @@ -47,6 +49,7 @@ name=Fedora - ELN BaseOS - Source baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/BaseOS/source/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch enabled=0 +metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 @@ -59,7 +62,7 @@ skip_if_unavailable=False name=Fedora - ELN AppStream - Developmental packages for the next Enterprise Linux release baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch -enabled=0 +enabled=AUTO_VALUE countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -73,6 +76,7 @@ name=Fedora - ELN AppStream - Debug baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/$basearch/debug/tree #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch enabled=0 +metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 @@ -84,6 +88,7 @@ name=Fedora - ELN AppStream - Source baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/AppStream/source/tree/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch enabled=0 +metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-modular.repo b/fedora-modular.repo index 1ecdf6f..f511170 100644 --- a/fedora-modular.repo +++ b/fedora-modular.repo @@ -2,9 +2,9 @@ name=Fedora Modular $releasever - $basearch #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=1 +enabled=AUTO_VALUE countme=1 -#metadata_expire=7d +metadata_expire=AUTO_VALUE repo_gpgcheck=0 type=rpm gpgcheck=1 @@ -16,7 +16,7 @@ name=Fedora Modular $releasever - $basearch - Debug #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/debug/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-debug-$releasever&arch=$basearch enabled=0 -metadata_expire=7d +metadata_expire=AUTO_VALUE repo_gpgcheck=0 type=rpm gpgcheck=1 @@ -28,7 +28,7 @@ name=Fedora Modular $releasever - Source #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-source-$releasever&arch=$basearch enabled=0 -metadata_expire=7d +metadata_expire=AUTO_VALUE repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo index 68fd3ae..24c47a7 100644 --- a/fedora-rawhide-modular.repo +++ b/fedora-rawhide-modular.repo @@ -11,7 +11,7 @@ # testing and troubleshooting for development packages in conjunction # with new test releases. # -# More information is available at http://fedoraproject.org/wiki/Testing +# More information is available at http://fedoraproject.org/wiki/Testing # # Reproducible and reportable issues should be filed at # http://bugzilla.redhat.com/. @@ -23,13 +23,13 @@ name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch -enabled=0 +enabled=AUTO_VALUE countme=1 metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE skip_if_unavailable=False [rawhide-modular-debuginfo] @@ -37,10 +37,11 @@ name=Fedora - Modular Rawhide - Debug #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/debug/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-debug&arch=$basearch enabled=0 +metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE skip_if_unavailable=False [rawhide-modular-source] @@ -48,9 +49,9 @@ name=Fedora - Modular Rawhide - Source #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular-source&arch=$basearch enabled=0 +metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE skip_if_unavailable=False - diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo index 5bed85b..5391fb0 100644 --- a/fedora-rawhide.repo +++ b/fedora-rawhide.repo @@ -11,7 +11,7 @@ # testing and troubleshooting for development packages in conjunction # with new test releases. # -# More information is available at http://fedoraproject.org/wiki/Testing +# More information is available at http://fedoraproject.org/wiki/Testing # # Reproducible and reportable issues should be filed at # http://bugzilla.redhat.com/. @@ -23,13 +23,13 @@ name=Fedora - Rawhide - Developmental packages for the next Fedora release #baseurl=http://download.example/pub/fedora/linux/development/rawhide//Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -enabled=0 +enabled=AUTO_VALUE countme=1 metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE skip_if_unavailable=False [rawhide-debuginfo] @@ -37,10 +37,11 @@ name=Fedora - Rawhide - Debug #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch enabled=0 +metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE skip_if_unavailable=False [rawhide-source] @@ -48,9 +49,9 @@ name=Fedora - Rawhide - Source #baseurl=http://download.example/pub/fedora/linux/development/rawhide/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch enabled=0 +metadata_expire=6h repo_gpgcheck=0 type=rpm gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch AUTO_VALUE skip_if_unavailable=False - diff --git a/fedora-repos.spec b/fedora-repos.spec index e0d9cba..fefbda2 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,4 +1,5 @@ %global rawhide_release 35 +%global updates_testing_enabled 1 Summary: Fedora package repositories Name: fedora-repos @@ -106,6 +107,9 @@ Summary: Rawhide repo definitions Requires: fedora-repos = %{version}-%{release} Obsoletes: fedora-repos-rawhide < 33-0.7 +%description rawhide +This package provides the rawhide repo definitions. + %package archive Summary: Fedora updates archive package repository Requires: fedora-repos = %{version}-%{release} @@ -115,9 +119,6 @@ This package provides the repo definition for the updates archive repo. It is a package repository that contains any RPM that has made it to stable in Bodhi and been available in the Fedora updates repo in the past. -%description rawhide -This package provides the rawhide repo definitions. - %package rawhide-modular Summary: Rawhide modular repo definitions Requires: fedora-repos = %{version}-%{release} @@ -187,20 +188,51 @@ done ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-%{version}-fedora popd +# Install repo files +install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d +for file in %{_sourcedir}/fedora*repo ; do + install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d +done + +# Enable or disable repos based on current release cycle state. +%if %{rawhide_release} == %{version} +rawhide_enabled=1 +stable_enabled=0 +testing_enabled=0 +%else +rawhide_enabled=0 +stable_enabled=1 +testing_enabled=%{updates_testing_enabled} +%endif +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do + sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1 +done +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo; do + sed -i "s/^enabled=AUTO_VALUE$/enabled=${stable_enabled}/" $repo || exit 1 +done +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do + sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1 +done + # Adjust Rawhide repo files to include Rawhide+1 GPG key. # This is necessary for the period when Rawhide gets bumped to N+1 and packages # start to be signed with a newer key. Without having the key specified in the # repo file, the system would consider the new packages as untrusted. rawhide_next=$((%{rawhide_release}+1)) -for repo in %{_sourcedir}/fedora-rawhide*.repo; do - sed -ir "s@^gpgkey=.*@& file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \ +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do + sed -i "/^gpgkey=/ s@AUTO_VALUE@file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-\$basearch@" \ $repo || exit 1 done -# Install repo files -install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d -for file in %{_sourcedir}/fedora*repo ; do - install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d +# Set appropriate metadata_expire in base repo files (6h before Final, 7d after) +%if "%{release}" < "1" +expire_value='6h' +%else +expire_value='7d' +%endif +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do + sed -i "/^metadata_expire=/ s/AUTO_VALUE/${expire_value}/" \ + $repo || exit 1 done # Install ostree remote config @@ -210,23 +242,82 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %check -# assert all rawhide/eln repos are set to enabled only when this is rawhide -for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do - %if %{rawhide_release} == %{version} - grep 'enabled=1' $repo - %else - grep 'enabled=1' $repo && exit 1 || : - %endif +# Make sure all repo variables were substituted +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/*.repo; do + if grep -q AUTO_VALUE $repo; then + echo "ERROR: Repo $repo contains an unsubstituted placeholder value" + exit 1 + fi done -# make sure the Rawhide+1 key wasn't forgotten to be created +# Make sure correct repos were enabled/disabled +enabled_repos=(fedora-cisco-openh264) +disabled_repos=(fedora-updates-archive) +%if %{rawhide_release} == %{version} +enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln) +disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular \ + fedora-updates-testing fedora-updates-testing-modular) +%else +enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular) +disabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln) +%if %{updates_testing_enabled} +enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular) +%else +disabled_repos+=(fedora-updates-testing fedora-updates-testing-modular) +%endif +%endif + +for repo in ${enabled_repos[@]}; do + if ! grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then + echo "ERROR: Repo $repo should have been enabled, but it isn't" + exit 1 + fi +done + +for repo in ${disabled_repos[@]}; do + if grep -q 'enabled=1' $RPM_BUILD_ROOT/etc/yum.repos.d/${repo}.repo; then + echo "ERROR: Repo $repo should have been disabled, but it isn't" + exit 1 + fi +done + +# Make sure updates-testing is not enabled in a Final (stable) release +%if "%{release}" >= "1" +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do + if grep -q 'enabled=1' $repo; then + echo "ERROR: Repo $repo should be disabled in a stable release, but it isn't" + exit 1 + fi +done +%endif + +# Make sure metadata_expire was correctly set +%if "%{release}" < "1" +expire_value='6h' +%else +expire_value='7d' +%endif +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora{,-modular}.repo; do + lines=$(grep '^metadata_expire=' $repo | sort | uniq) + if [ "$(echo "$lines" | wc -l)" -ne 1 ]; then + echo "ERROR: Non-matching metadata_expire lines in $repo: $lines" + exit 1 + fi + if test "$lines" != "metadata_expire=${expire_value}"; then + echo "ERROR: Wrong metadata_expire value in $repo: $lines" + exit 1 + fi +done + +# Make sure the Rawhide+1 key wasn't forgotten to be created rawhide_next=$((%{rawhide_release}+1)) +test -n "$rawhide_next" || exit 1 if ! test -f $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${rawhide_next}-primary; then echo "ERROR: GPG key for Fedora ${rawhide_next} is not present" exit 1 fi -# make sure the Rawhide+1 key is present in Rawhide repo files +# Make sure the Rawhide+1 key is present in Rawhide repo files for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-rawhide*.repo; do gpg_lines=$(grep '^gpgkey=' $repo) if test -z "$gpg_lines"; then diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo index bcfc886..f5350a0 100644 --- a/fedora-updates-modular.repo +++ b/fedora-updates-modular.repo @@ -2,7 +2,7 @@ name=Fedora Modular $releasever - $basearch - Updates #baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch -enabled=1 +enabled=AUTO_VALUE countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo index 6e39b26..3b9bfca 100644 --- a/fedora-updates-testing-modular.repo +++ b/fedora-updates-testing-modular.repo @@ -2,7 +2,7 @@ name=Fedora Modular $releasever - $basearch - Test Updates #baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch -enabled=1 +enabled=AUTO_VALUE countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 837355c..91dc671 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch - Test Updates #baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch -enabled=1 +enabled=AUTO_VALUE countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora-updates.repo b/fedora-updates.repo index 9d9f2fd..80ccb4d 100644 --- a/fedora-updates.repo +++ b/fedora-updates.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch - Updates #baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -enabled=1 +enabled=AUTO_VALUE countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora.repo b/fedora.repo index 12a8e11..66d4de7 100644 --- a/fedora.repo +++ b/fedora.repo @@ -2,9 +2,9 @@ name=Fedora $releasever - $basearch #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -enabled=1 +enabled=AUTO_VALUE countme=1 -#metadata_expire=7d +metadata_expire=AUTO_VALUE repo_gpgcheck=0 type=rpm gpgcheck=1 @@ -16,7 +16,7 @@ name=Fedora $releasever - $basearch - Debug #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch enabled=0 -metadata_expire=7d +metadata_expire=AUTO_VALUE repo_gpgcheck=0 type=rpm gpgcheck=1 @@ -28,7 +28,7 @@ name=Fedora $releasever - Source #baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch enabled=0 -metadata_expire=7d +metadata_expire=AUTO_VALUE repo_gpgcheck=0 type=rpm gpgcheck=1 From c67d15a388cc425d0e460e258444ec954bd5d03a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 12 Apr 2021 14:33:30 -0400 Subject: [PATCH 6/7] Setup for F34 Final Disable testing repos Signed-off-by: Mohan Boddu --- fedora-repos.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index fefbda2..a5a7d86 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,10 +1,10 @@ %global rawhide_release 35 -%global updates_testing_enabled 1 +%global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos Version: 34 -Release: 0.14%{?eln:.eln%{eln}} +Release: 1%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -370,6 +370,10 @@ done %changelog +* Mon Apr 12 2021 Mohan Boddu - 34-1 +- Setup for F34 Final +- Disable testing repos + * Mon Feb 22 2021 Kamil Páral - 34-0.14 - Sync changes from Rawhide (the rawhide gpg symlink), disable ELN repo From 31be6793942c526c2ae7c9104b555b776879b008 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 27 Apr 2021 17:16:00 -0400 Subject: [PATCH 7/7] Enable the updates archive repo on non-rawhide. The fedora-repos-archive RPM is only installed by default in places where it is needed (i.e. OSTree based distributions). The yum repo file delivered by the RPM should default to being enabled when on a numbered version of Fedora (non-rawhide). This was the original intention when I added it a while back. (cherry picked from commit e245df682c5e2526284434354a612838bbc7d52b) --- fedora-repos.spec | 19 ++++++++++++++----- fedora-updates-archive.repo | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index a5a7d86..605d1ae 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -4,7 +4,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 34 -Release: 1%{?eln:.eln%{eln}} +Release: 2%{?eln:.eln%{eln}} License: MIT URL: https://fedoraproject.org/ @@ -199,10 +199,12 @@ done rawhide_enabled=1 stable_enabled=0 testing_enabled=0 +archive_enabled=0 %else rawhide_enabled=0 stable_enabled=1 testing_enabled=%{updates_testing_enabled} +archive_enabled=1 %endif for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-{rawhide,eln}*.repo; do sed -i "s/^enabled=AUTO_VALUE$/enabled=${rawhide_enabled}/" $repo || exit 1 @@ -213,6 +215,9 @@ done for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-testing{,-modular}.repo; do sed -i "s/^enabled=AUTO_VALUE$/enabled=${testing_enabled}/" $repo || exit 1 done +for repo in $RPM_BUILD_ROOT/etc/yum.repos.d/fedora-updates-archive.repo; do + sed -i "s/^enabled=AUTO_VALUE$/enabled=${archive_enabled}/" $repo || exit 1 +done # Adjust Rawhide repo files to include Rawhide+1 GPG key. # This is necessary for the period when Rawhide gets bumped to N+1 and packages @@ -252,13 +257,14 @@ done # Make sure correct repos were enabled/disabled enabled_repos=(fedora-cisco-openh264) -disabled_repos=(fedora-updates-archive) +disabled_repos=() %if %{rawhide_release} == %{version} enabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln) -disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular \ - fedora-updates-testing fedora-updates-testing-modular) +disabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \ + fedora-updates-modular fedora-updates-testing fedora-updates-testing-modular) %else -enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-modular) +enabled_repos+=(fedora fedora-modular fedora-updates fedora-updates-archive \ + fedora-updates-modular) disabled_repos+=(fedora-rawhide fedora-rawhide-modular fedora-eln) %if %{updates_testing_enabled} enabled_repos+=(fedora-updates-testing fedora-updates-testing-modular) @@ -370,6 +376,9 @@ done %changelog +* Wed Apr 28 2021 Dusty Mabe - 34-2 +- Enable the updates archive repo on non-rawhide. + * Mon Apr 12 2021 Mohan Boddu - 34-1 - Setup for F34 Final - Disable testing repos diff --git a/fedora-updates-archive.repo b/fedora-updates-archive.repo index 4cc3551..1125c52 100644 --- a/fedora-updates-archive.repo +++ b/fedora-updates-archive.repo @@ -12,7 +12,7 @@ [updates-archive] name=Fedora $releasever - $basearch - Updates Archive baseurl=https://fedoraproject-updates-archive.fedoraproject.org/fedora/$releasever/$basearch/ -enabled=0 +enabled=AUTO_VALUE metadata_expire=6h repo_gpgcheck=0 type=rpm