From ae2f175b6b821f01b454fea82b3c87f381d8a6f1 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 11 Feb 2020 10:20:55 -0500 Subject: [PATCH 01/24] Branching F32 from rawhide Signed-off-by: Mohan Boddu --- fedora-modular.repo | 2 +- fedora-rawhide-modular.repo | 2 +- fedora-rawhide.repo | 2 +- fedora-repos.spec | 9 +++++---- fedora-updates-modular.repo | 2 +- fedora-updates-testing-modular.repo | 2 +- fedora-updates-testing.repo | 2 +- fedora-updates.repo | 2 +- fedora.repo | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fedora-modular.repo b/fedora-modular.repo index e7c436e..8bccd7b 100644 --- a/fedora-modular.repo +++ b/fedora-modular.repo @@ -1,7 +1,7 @@ [fedora-modular] name=Fedora Modular $releasever - $basearch 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 25548ac..9242e07 100644 --- a/fedora-rawhide-modular.repo +++ b/fedora-rawhide-modular.repo @@ -22,7 +22,7 @@ [rawhide-modular] name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release 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 7fb162c..cb76183 100644 --- a/fedora-rawhide.repo +++ b/fedora-rawhide.repo @@ -22,7 +22,7 @@ [rawhide] name=Fedora - Rawhide - Developmental packages for the next Fedora release 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 0763f8e..b719b9f 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos -Version: 33 -Release: 0.1%{?_module_build:%{?dist}} +Version: 32 +Release: 0.5%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -168,8 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog -* Tue Feb 11 2020 Mohan Boddu - 33-0.1 -- Setup for rawhide being F33 +* Tue Feb 11 2020 Mohan Boddu - 32-0.5 +- Disable rawhide repos +- Enable fedora, updates, updates-testing repos * Tue Feb 11 2020 Mohan Boddu - 32-0.4 - Remove baseurl download.fp.o (puiterwijk) diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo index b73258f..0b3767c 100644 --- a/fedora-updates-modular.repo +++ b/fedora-updates-modular.repo @@ -1,7 +1,7 @@ [updates-modular] name=Fedora Modular $releasever - $basearch - Updates 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 9dcedbb..026b010 100644 --- a/fedora-updates-testing-modular.repo +++ b/fedora-updates-testing-modular.repo @@ -1,7 +1,7 @@ [updates-testing-modular] name=Fedora Modular $releasever - $basearch - Test Updates 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 db00456..1478416 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -1,7 +1,7 @@ [updates-testing] name=Fedora $releasever - $basearch - Test Updates 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 3691dc4..8f009f7 100644 --- a/fedora-updates.repo +++ b/fedora-updates.repo @@ -1,7 +1,7 @@ [updates] name=Fedora $releasever - $basearch - Updates metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -enabled=0 +enabled=1 countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora.repo b/fedora.repo index 3e59790..8dc0323 100644 --- a/fedora.repo +++ b/fedora.repo @@ -1,7 +1,7 @@ [fedora] name=Fedora $releasever - $basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -enabled=0 +enabled=1 countme=1 #metadata_expire=7d repo_gpgcheck=0 From b1af36fa3d02d1b171bda470a30d7a7b4fbcca4a Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 18 Feb 2020 09:47:29 -0800 Subject: [PATCH 02/24] Re-add baseurl lines, but using example domain This sorta reverts f30862ce, because it turns out various people (including me!) actually rely on these commented-out baseurl lines in various ways. I (in openQA tests) and at least one other person (hiredman on IRC), for e.g., use them as a base to modify by changing the host, but keeping the path component, to use a specific host that is known to always be a fast local one in a particular environment and avoid the overhead of the metalink/ mirrorlist system. To avoid encouraging the use of the download.fedoraproject.org redirect system (as was the original intent), we replace the hostname with an example one, so the line clearly cannot be used as-is just by removing the #. We *could* also add a couple of comment lines specifically discouraging people from using baseurl unless they're very sure it's what they need, but I don't know if it's necessary. Signed-off-by: Adam Williamson --- fedora-modular.repo | 3 +++ fedora-rawhide-modular.repo | 3 +++ fedora-rawhide.repo | 3 +++ fedora-updates-modular.repo | 3 +++ fedora-updates-testing-modular.repo | 3 +++ fedora-updates-testing.repo | 3 +++ fedora-updates.repo | 3 +++ fedora.repo | 3 +++ 8 files changed, 24 insertions(+) diff --git a/fedora-modular.repo b/fedora-modular.repo index 8bccd7b..1ecdf6f 100644 --- a/fedora-modular.repo +++ b/fedora-modular.repo @@ -1,5 +1,6 @@ [fedora-modular] 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 countme=1 @@ -12,6 +13,7 @@ skip_if_unavailable=False [fedora-modular-debuginfo] 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 @@ -23,6 +25,7 @@ skip_if_unavailable=False [fedora-modular-source] 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 diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo index 9242e07..68fd3ae 100644 --- a/fedora-rawhide-modular.repo +++ b/fedora-rawhide-modular.repo @@ -21,6 +21,7 @@ [rawhide-modular] 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 countme=1 @@ -33,6 +34,7 @@ skip_if_unavailable=False [rawhide-modular-debuginfo] 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 repo_gpgcheck=0 @@ -43,6 +45,7 @@ skip_if_unavailable=False [rawhide-modular-source] 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 repo_gpgcheck=0 diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo index cb76183..5bed85b 100644 --- a/fedora-rawhide.repo +++ b/fedora-rawhide.repo @@ -21,6 +21,7 @@ [rawhide] 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 countme=1 @@ -33,6 +34,7 @@ skip_if_unavailable=False [rawhide-debuginfo] 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 repo_gpgcheck=0 @@ -43,6 +45,7 @@ skip_if_unavailable=False [rawhide-source] 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 repo_gpgcheck=0 diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo index 0b3767c..bcfc886 100644 --- a/fedora-updates-modular.repo +++ b/fedora-updates-modular.repo @@ -1,5 +1,6 @@ [updates-modular] 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 countme=1 @@ -12,6 +13,7 @@ skip_if_unavailable=False [updates-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Updates - Debug +#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 @@ -23,6 +25,7 @@ skip_if_unavailable=False [updates-modular-source] name=Fedora Modular $releasever - Updates Source +#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo index 026b010..6e39b26 100644 --- a/fedora-updates-testing-modular.repo +++ b/fedora-updates-testing-modular.repo @@ -1,5 +1,6 @@ [updates-testing-modular] 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 countme=1 @@ -12,6 +13,7 @@ skip_if_unavailable=False [updates-testing-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Test Updates Debug +#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-debug-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 @@ -23,6 +25,7 @@ skip_if_unavailable=False [updates-testing-modular-source] name=Fedora Modular $releasever - Test Updates Source +#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/SRPMS/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-source-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 1478416..837355c 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -1,5 +1,6 @@ [updates-testing] 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 countme=1 @@ -12,6 +13,7 @@ skip_if_unavailable=False [updates-testing-debuginfo] name=Fedora $releasever - $basearch - Test Updates Debug +#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 @@ -23,6 +25,7 @@ skip_if_unavailable=False [updates-testing-source] name=Fedora $releasever - Test Updates Source +#baseurl=http://download.example/pub/fedora/linux/updates/testing/$releasever/Everything/SRPMS/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 diff --git a/fedora-updates.repo b/fedora-updates.repo index 8f009f7..9d9f2fd 100644 --- a/fedora-updates.repo +++ b/fedora-updates.repo @@ -1,5 +1,6 @@ [updates] 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 countme=1 @@ -12,6 +13,7 @@ skip_if_unavailable=False [updates-debuginfo] name=Fedora $releasever - $basearch - Updates - Debug +#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 @@ -23,6 +25,7 @@ skip_if_unavailable=False [updates-source] name=Fedora $releasever - Updates Source +#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 diff --git a/fedora.repo b/fedora.repo index 8dc0323..12a8e11 100644 --- a/fedora.repo +++ b/fedora.repo @@ -1,5 +1,6 @@ [fedora] 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 countme=1 @@ -12,6 +13,7 @@ skip_if_unavailable=False [fedora-debuginfo] 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 @@ -23,6 +25,7 @@ skip_if_unavailable=False [fedora-source] 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 From 20f8921a4562f91f46243cb9bdf3566f619f8436 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 19 Feb 2020 10:03:29 -0800 Subject: [PATCH 03/24] Bump for build Signed-off-by: Adam Williamson --- fedora-repos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index b719b9f..59665d2 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 0.5%{?_module_build:%{?dist}} +Release: 0.6%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -168,6 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Wed Feb 19 2020 Adam Williamson - 32-0.6 +- Restore baseurl lines, but with example domain + * Tue Feb 11 2020 Mohan Boddu - 32-0.5 - Disable rawhide repos - Enable fedora, updates, updates-testing repos From 32f4788561136815bbc9a06e576ff72633ee5853 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 22 Feb 2020 18:47:51 -0500 Subject: [PATCH 04/24] Enable fedora-cisco-openh264 repo by default Signed-off-by: Neal Gompa --- fedora-cisco-openh264.repo | 2 +- fedora-repos.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo index 32a3241..dbd59a3 100644 --- a/fedora-cisco-openh264.repo +++ b/fedora-cisco-openh264.repo @@ -2,7 +2,7 @@ name=Fedora $releasever openh264 (From Cisco) - $basearch baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/ type=rpm -enabled=0 +enabled=1 enabled_metadata=1 metadata_expire=14d repo_gpgcheck=1 diff --git a/fedora-repos.spec b/fedora-repos.spec index 59665d2..fc81358 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 0.6%{?_module_build:%{?dist}} +Release: 0.7%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -168,6 +168,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Sat Feb 22 2020 Neal Gompa - 32-0.7 +- Enable fedora-cisco-openh264 repo by default + * Wed Feb 19 2020 Adam Williamson - 32-0.6 - Restore baseurl lines, but with example domain From bcb2ffa022ca35fa6ac0338fce7ee9d17cde6bc8 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 3 Mar 2020 14:00:30 -0500 Subject: [PATCH 05/24] Dont pull in fedora-repos-rawhide Signed-off-by: Mohan Boddu --- fedora-repos.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index fc81358..6135f0d 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -7,7 +7,6 @@ URL: https://fedoraproject.org/ Provides: fedora-repos(%{version}) Requires: system-release(%{version}) -Requires: fedora-repos-rawhide = %{version}-%{release} Requires: fedora-gpg-keys >= %{version}-%{release} Obsoletes: fedora-repos-anaconda < 22-0.3 Obsoletes: fedora-repos-modular < 29-0.6 @@ -170,6 +169,7 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ %changelog * Sat Feb 22 2020 Neal Gompa - 32-0.7 - Enable fedora-cisco-openh264 repo by default +- Dont pull in fedora-repos-rawhide (mohanboddu) * Wed Feb 19 2020 Adam Williamson - 32-0.6 - Restore baseurl lines, but with example domain From 391b5689b14ccb7e81616e669b5c6d8322779364 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 9 Apr 2020 14:08:03 +0200 Subject: [PATCH 06/24] Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck dnf has various bugs around repo_gpgcheck=1 repos and this allows us to work this around. https://bugzilla.redhat.com/show_bug.cgi?id=1768206 Signed-off-by: Kalev Lember --- fedora-cisco-openh264.repo | 8 ++++---- fedora-repos.spec | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo index dbd59a3..43234c3 100644 --- a/fedora-cisco-openh264.repo +++ b/fedora-cisco-openh264.repo @@ -1,22 +1,22 @@ [fedora-cisco-openh264] name=Fedora $releasever openh264 (From Cisco) - $basearch -baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch type=rpm enabled=1 enabled_metadata=1 metadata_expire=14d -repo_gpgcheck=1 +repo_gpgcheck=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=True [fedora-cisco-openh264-debuginfo] name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug -baseurl=https://codecs.fedoraproject.org/openh264/$releasever/$basearch/debug/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch type=rpm enabled=0 metadata_expire=28d -repo_gpgcheck=1 +repo_gpgcheck=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=True diff --git a/fedora-repos.spec b/fedora-repos.spec index 6135f0d..8212229 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 0.7%{?_module_build:%{?dist}} +Release: 0.8%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -167,6 +167,10 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Thu Apr 09 2020 Kalev Lember - 32-0.8 +- Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck + (#1768206) + * Sat Feb 22 2020 Neal Gompa - 32-0.7 - Enable fedora-cisco-openh264 repo by default - Dont pull in fedora-repos-rawhide (mohanboddu) From 771447512eabae7d8a855bcbae11bd7914ff9ec1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 9 Apr 2020 14:09:32 +0200 Subject: [PATCH 07/24] Use the same metadata_expire time for fedora-cisco-openh264 and -debuginfo The repos are updated together so we should make sure they expire at the same time as well. Signed-off-by: Kalev Lember --- fedora-cisco-openh264.repo | 2 +- fedora-repos.spec | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo index 43234c3..4728915 100644 --- a/fedora-cisco-openh264.repo +++ b/fedora-cisco-openh264.repo @@ -15,7 +15,7 @@ name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-debug-$releasever&arch=$basearch type=rpm enabled=0 -metadata_expire=28d +metadata_expire=14d repo_gpgcheck=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch diff --git a/fedora-repos.spec b/fedora-repos.spec index 8212229..e52cb34 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -170,6 +170,7 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ * Thu Apr 09 2020 Kalev Lember - 32-0.8 - Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck (#1768206) +- Use the same metadata_expire time for fedora-cisco-openh264 and -debuginfo * Sat Feb 22 2020 Neal Gompa - 32-0.7 - Enable fedora-cisco-openh264 repo by default From 16d307228bae48a886776fcec24b7842a9e74899 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 9 Apr 2020 14:10:55 +0200 Subject: [PATCH 08/24] Remove enabled_metadata key for fedora-cisco-openh264 The repo is enabled by default now so we no longer need this. Signed-off-by: Kalev Lember --- fedora-cisco-openh264.repo | 1 - fedora-repos.spec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-cisco-openh264.repo b/fedora-cisco-openh264.repo index 4728915..02150d9 100644 --- a/fedora-cisco-openh264.repo +++ b/fedora-cisco-openh264.repo @@ -3,7 +3,6 @@ name=Fedora $releasever openh264 (From Cisco) - $basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cisco-openh264-$releasever&arch=$basearch type=rpm enabled=1 -enabled_metadata=1 metadata_expire=14d repo_gpgcheck=0 gpgcheck=1 diff --git a/fedora-repos.spec b/fedora-repos.spec index e52cb34..5bb724e 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -171,6 +171,7 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ - Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck (#1768206) - Use the same metadata_expire time for fedora-cisco-openh264 and -debuginfo +- Remove enabled_metadata key for fedora-cisco-openh264 * Sat Feb 22 2020 Neal Gompa - 32-0.7 - Enable fedora-cisco-openh264 repo by default From efd95302c423f7632bc4f5c8a061f5f47ce437b9 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 9 Apr 2020 23:19:03 -0400 Subject: [PATCH 09/24] Setup for F32 Final Signed-off-by: Mohan Boddu --- fedora-repos.spec | 6 +++++- fedora-updates-testing-modular.repo | 2 +- fedora-updates-testing.repo | 2 +- fedora.repo | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 5bb724e..3abf1e1 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 0.8%{?_module_build:%{?dist}} +Release: 1%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -167,6 +167,10 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Thu Apr 09 2020 Mohan Boddu - 32-1 +- Setup for F32 Final +- Disable testing repos + * Thu Apr 09 2020 Kalev Lember - 32-0.8 - Switch to metalink for fedora-cisco-openh264 and disable repo gpgcheck (#1768206) diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo index 6e39b26..5cd78af 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=0 countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 837355c..9306abb 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=0 countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora.repo b/fedora.repo index 12a8e11..f9bfbb1 100644 --- a/fedora.repo +++ b/fedora.repo @@ -4,7 +4,7 @@ name=Fedora $releasever - $basearch metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch enabled=1 countme=1 -#metadata_expire=7d +metadata_expire=7d repo_gpgcheck=0 type=rpm gpgcheck=1 From 4df6cc792a64157ca7fe7f2dfa75c258c36276d6 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 13 Apr 2020 10:10:51 -0400 Subject: [PATCH 10/24] Add the release to the fedora-repos(NN) Provides: Signed-off-by: Stephen Gallagher --- fedora-repos.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 3abf1e1..15664e0 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,11 +1,11 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 1%{?_module_build:%{?dist}} +Release: 2%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ -Provides: fedora-repos(%{version}) +Provides: fedora-repos(%{version}) = %{release} Requires: system-release(%{version}) Requires: fedora-gpg-keys >= %{version}-%{release} Obsoletes: fedora-repos-anaconda < 22-0.3 @@ -167,6 +167,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Mon Apr 13 2020 Stephen Gallagher - 32-2 +- Add the release to the fedora-repos(NN) Provides: + * Thu Apr 09 2020 Mohan Boddu - 32-1 - Setup for F32 Final - Disable testing repos From 0cb76b0e6a4e5bf4a72e5adfab3e6caa47f9b9e3 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 2 Jun 2020 12:42:59 -0400 Subject: [PATCH 11/24] Add fedora compose ostree repo to fedora-repos-ostree subpackage This will allow community members to more easily test development builds because the remote information for the compose ostree repo will already be on the system. That means they'll be a simple `rpm-ostree rebase fedora-compose:` away from testing out a development version. Signed-off-by: Dusty Mabe --- fedora-compose.conf | 4 ++++ fedora-repos.spec | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 fedora-compose.conf diff --git a/fedora-compose.conf b/fedora-compose.conf new file mode 100644 index 0000000..8bf015d --- /dev/null +++ b/fedora-compose.conf @@ -0,0 +1,4 @@ +[remote "fedora-compose"] +url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ +gpg-verify=true +gpgkeypath=/etc/pki/rpm-gpg/ diff --git a/fedora-repos.spec b/fedora-repos.spec index 15664e0..2df936c 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 2%{?_module_build:%{?dist}} +Release: 3%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -73,6 +73,7 @@ Source104: RPM-GPG-KEY-fedora-modularity Source150: RPM-GPG-KEY-fedora-iot-2019 Source151: fedora.conf +Source152: fedora-compose.conf %description Fedora package repository files for yum and dnf along with gpg public keys @@ -140,6 +141,7 @@ done # Install ostree remote config install -d -m 755 $RPM_BUILD_ROOT/etc/ostree/remotes.d/ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ +install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ %files %dir /etc/yum.repos.d @@ -165,8 +167,12 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ %files ostree %dir /etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf +/etc/ostree/remotes.d/fedora-compose.conf %changelog +* Mon Jun 01 2020 Dusty Mabe - 32-3 +- Add fedora compose ostree repo to fedora-repos-ostree + * Mon Apr 13 2020 Stephen Gallagher - 32-2 - Add the release to the fedora-repos(NN) Provides: From 401727e3da78f48ac05c949ddf2a9f535ba7b876 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 26 Jun 2020 13:25:04 -0400 Subject: [PATCH 12/24] Add disabled optional ELN repositories' subpackage Signed-off-by: Stephen Gallagher --- fedora-eln-modular.repo | 56 +++++++++++++++++++++++++++++++++++++++++ fedora-eln.repo | 56 +++++++++++++++++++++++++++++++++++++++++ fedora-repos.spec | 23 ++++++++++++++++- 3 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 fedora-eln-modular.repo create mode 100644 fedora-eln.repo diff --git a/fedora-eln-modular.repo b/fedora-eln-modular.repo new file mode 100644 index 0000000..719e1e1 --- /dev/null +++ b/fedora-eln-modular.repo @@ -0,0 +1,56 @@ +# These packages are untested and still under development. This +# repository is used for development of new releases. +# +# This repository can see significant daily turnover and major +# functionality changes which cause unexpected problems with other +# development packages. Please use these packages if you want to work +# with the Fedora developers by testing these new development packages. +# +# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription +# Required) is available as a discussion forum for +# testing and troubleshooting for development packages in conjunction +# with new test releases. +# +# More information is available at http://fedoraproject.org/wiki/Testing +# +# Reproducible and reportable issues should be filed at +# http://bugzilla.redhat.com/. +# +# Product: Fedora +# Version: eln-modular + +[eln-modular] +name=Fedora - Modular ELN - Developmental modular packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular&arch=$basearch +enabled=0 +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + +[eln-modular-debuginfo] +name=Fedora - Modular ELN - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/x86_64/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-debug&arch=$basearch +enabled=0 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + +[eln-modular-source] +name=Fedora - Modular ELN - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-source&arch=$basearch +enabled=0 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + diff --git a/fedora-eln.repo b/fedora-eln.repo new file mode 100644 index 0000000..78f9bfb --- /dev/null +++ b/fedora-eln.repo @@ -0,0 +1,56 @@ +# These packages are untested and still under development. This +# repository is used for development of new releases. +# +# This repository can see significant daily turnover and major +# functionality changes which cause unexpected problems with other +# development packages. Please use these packages if you want to work +# with the Fedora developers by testing these new development packages. +# +# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription +# Required) is available as a discussion forum for +# testing and troubleshooting for development packages in conjunction +# with new test releases. +# +# More information is available at http://fedoraproject.org/wiki/Testing +# +# Reproducible and reportable issues should be filed at +# http://bugzilla.redhat.com/. +# +# Product: Fedora +# Version: eln + +[eln] +name=Fedora - ELN - Developmental modular packages for the next Enterprise Linux release +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln&arch=$basearch +enabled=0 +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + +[eln-debuginfo] +name=Fedora - ELN - Debug +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/x86_64/debug/tree +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-debug&arch=$basearch +enabled=0 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + +[eln-source] +name=Fedora - ELN - Source +baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/source/tree/ +#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-source&arch=$basearch +enabled=0 +repo_gpgcheck=0 +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 2df936c..4ff1c47 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 3%{?_module_build:%{?dist}} +Release: 4%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -75,6 +75,9 @@ Source150: RPM-GPG-KEY-fedora-iot-2019 Source151: fedora.conf Source152: fedora-compose.conf +Source200: fedora-eln.repo +Source201: fedora-eln-modular.repo + %description Fedora package repository files for yum and dnf along with gpg public keys @@ -105,6 +108,16 @@ This package provides ostree specfic files like remote config from where client's system will pull OSTree updates. +%package eln +Summary: ELN repo definitions +Requires: fedora-repos-rawhide = %{version}-%{release} +Requires: fedora-repos-rawhide-modular = %{version}-%{release} + +%description eln +This package provides repository files for ELN (Enterprise Linux Next) +packages that can be installed atop Rawhide. Note that these packages are +experimental and should not be used in a production environment. + %prep @@ -169,7 +182,15 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo /etc/ostree/remotes.d/fedora.conf /etc/ostree/remotes.d/fedora-compose.conf +%files eln +%config(noreplace) /etc/yum.repos.d/fedora-eln.repo +%config(noreplace) /etc/yum.repos.d/fedora-eln-modular.repo + + %changelog +* Tue Jun 30 2020 Stephen Gallagher - 32-4 +- Add optional repositories for ELN + * Mon Jun 01 2020 Dusty Mabe - 32-3 - Add fedora compose ostree repo to fedora-repos-ostree From e3a6a5e103ec2b2394f08a663f0c87fc577bba7a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 6 Aug 2020 09:34:23 -0400 Subject: [PATCH 13/24] Adding F34 key Signed-off-by: Mohan Boddu --- RPM-GPG-KEY-fedora-34-primary | 29 +++++++++++++++++++++++++++++ fedora-repos.spec | 6 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-34-primary diff --git a/RPM-GPG-KEY-fedora-34-primary b/RPM-GPG-KEY-fedora-34-primary new file mode 100644 index 0000000..42aafcd --- /dev/null +++ b/RPM-GPG-KEY-fedora-34-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBF8sAZIBEADKYvLg/5FdLXcVryAFd7Q8qrJq23R7ebxUT1u48Dc8xrsfYJZq +aMcna/xw47wZNyek4Z6YpzqfmnjR7H8yRH/1hAPi/ixYnA6DVL7O3eGE5lYGJzN3 +E2ILTzBOI9o/pavvtOqW9N5WIus8cqSdA921v8YPzr3/BTKgGqC9biOrMA+3sNoe +U4T+dztLg20SyBTr/rBH0eui2p/ipvIRuJvHLTKTubR+yG804yupI69M6qFBDebT +rm+CBmwVyj/DY/92LgvCgYqV/TL5FU4qvtyB6jd8JkEeaz/G7UmDRB5JqzKEu6TB +N3SY7nwLiRpIaXet1TWVW/8UKSB2JvYt1LbZyEO82/QOIXxqvV6h3kuBI21RvURz +VxEjRlvPRGHMZ80OoAQqNPkLnVTcX1eLj2ClbwoXCmXFSm72cCCt1SzcAmlaWh8E +rXSUZfs7XqkBrbphXHZ1e6Vxjt/RyKC5doklfOhbuF8gJ31CPo/kuOjFrHGzOwgi +Llec+GHGMfI/cUOu59qo3W85GHsntvEMk83QLkKjBInEYjZSAajp/lS4QF+SD4pl +Qj6Vc1mMCmci61cXX5CcIl1YxNJZzUfZEZNbUjDajqGzkYJoG9n2yJB0w4OiqsAe +ZCirmUIeDUNeI082epc4RFuV33hByGYY9kRWSyM+aCF6PYVISj4l1o9KcQARAQAB +tDFGZWRvcmEgKDM0KSA8ZmVkb3JhLTM0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJOBBMBCAA4FiEEjFummQvbJuGfKhqAEWGuaUVxmjkFAl8sAZICGw8FCwkI +BwIGFQoJCAsCBBYCAwECHgECF4AACgkQEWGuaUVxmjlVuA//QnMA02tydqwpM7r4 +WZ4OvlVqFWHhn3oDaBSwBvn6R1oC0MWbr79nnFDn3tpSkZDUdb7wyArmaF8kG8tI +wit5xD/JAzqRBVa9z2hY3n1SFafU/hp3DwbGIL4vLUv3fRayCgWsGhGp0tZvDC9q +PSvQZ675XpRG4pt/TGJB5gGXw7Jxoae/ffaJeblLLRDlSV/bKJt9sYpdu5InDG2i +yIUHfamtYQtnENKL/bN6w7tU/IEgCHqxPmPRiJ0gTUAi5Yabp1+JHqskE85Hm2QF +xMonX595Ry1yZzCjPGhCPAknJ4BhisXV+E/iV3Jyh8vxbJCo1//ygd1Xz8SkCuu/ +I0xPtFcVSIP2ikYpJwR2nwwQlLbQYIGCw/S1LV725oEYm/Z1xQ5zha2hBB+fxSwz +7MHsD2XIHrP8NNwt3ywG3NV/BSSkvSSStGUNcQyGRi3O/x/BEIRtWRxgoNO9o3jE +xtWFq3G5+gKY+wfYz/cTGlsWPDG7Fzx4lNisIGATKtLNqdedl7LASPK93z0XDdnS +kfKF0HrT9rdzIKRu4xWatUVIq/65Gv7nsavdsRAQL/Y0jl6sjjQac/Te5J0fByHY +6tGG1W0UWTd0rzFWitEZI/64/Bs83rGhjJNLqWXItZ5VqLe0TWzuxvRFLfM7oX8r +n5Si4l7NpIJubWPqjPoCoP5lsS8= +=V2FG +-----END PGP PUBLIC KEY BLOCK----- diff --git a/fedora-repos.spec b/fedora-repos.spec index 4ff1c47..204dc02 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 4%{?_module_build:%{?dist}} +Release: 5%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -64,6 +64,7 @@ Source50: RPM-GPG-KEY-fedora-30-primary Source51: RPM-GPG-KEY-fedora-31-primary Source52: RPM-GPG-KEY-fedora-32-primary Source53: RPM-GPG-KEY-fedora-33-primary +Source54: RPM-GPG-KEY-fedora-34-primary Source100: fedora-modular.repo Source101: fedora-updates-modular.repo @@ -188,6 +189,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %changelog +* Thu Aug 06 2020 Mohan Boddu - 32-5 +- Adding F34 key + * Tue Jun 30 2020 Stephen Gallagher - 32-4 - Add optional repositories for ELN From cb6b44830d5813d7a035a9965425df53e41eeeb3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 25 Aug 2020 13:21:52 -0700 Subject: [PATCH 14/24] Add missing per-arch symlinks for F34 key --- archmap | 2 ++ fedora-repos.spec | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/archmap b/archmap index cfd6fb7..3a83fff 100644 --- a/archmap +++ b/archmap @@ -70,3 +70,5 @@ fedora-31-primary: i386 x86_64 armhfp aarch64 ppc64le s390x fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x + +fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x diff --git a/fedora-repos.spec b/fedora-repos.spec index 204dc02..9c532ec 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 5%{?_module_build:%{?dist}} +Release: 6%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -189,6 +189,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %changelog +* Tue Aug 25 2020 Adam Williamson - 32-6 +- Add missing per-arch symlinks for F34 key + * Thu Aug 06 2020 Mohan Boddu - 32-5 - Adding F34 key From 1ed94bba5e880bbae7ab86482cf1e053593fdf98 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 5 Oct 2020 14:19:54 -0400 Subject: [PATCH 15/24] Add the fedora-repos-archive subpackage. This should aid our efforts to make package layering more reliable in OSTree based Editions. See: - https://github.com/coreos/fedora-coreos-tracker/issues/400 - https://github.com/coreos/fedora-coreos-tracker/issues/401 - https://pagure.io/releng/issue/9717 - https://lists.fedoraproject.org/archives/list/iot@lists.fedoraproject.org/thread/QZFVKH2SMHJNIZS2M4U25CHJOZXIKLWG/ Signed-off-by: Dusty Mabe (cherry picked from commit 51f622a8ca8faa70e5405968e10355c6104d457a) --- fedora-repos.spec | 18 +++++++++++++++++- fedora-updates-archive.repo | 22 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 fedora-updates-archive.repo diff --git a/fedora-repos.spec b/fedora-repos.spec index 9c532ec..740fff5 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 6%{?_module_build:%{?dist}} +Release: 7%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -19,6 +19,7 @@ Source3: fedora-updates.repo Source4: fedora-updates-testing.repo Source5: fedora-rawhide.repo Source6: fedora-cisco-openh264.repo +Source7: fedora-updates-archive.repo Source10: RPM-GPG-KEY-fedora-7-primary Source11: RPM-GPG-KEY-fedora-8-primary @@ -89,6 +90,15 @@ Obsoletes: fedora-release-rawhide <= 22-0.3 Obsoletes: fedora-repos-rawhide-modular < 29-0.6 Provides: fedora-repos-rawhide-modular = %{version}-%{release} +%package archive +Summary: Fedora updates archive package repository +Requires: fedora-repos = %{version}-%{release} + +%description archive +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. @@ -168,6 +178,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %config(noreplace) /etc/yum.repos.d/fedora-updates-modular.repo %config(noreplace) /etc/yum.repos.d/fedora-updates-testing-modular.repo +%files archive +%config(noreplace) /etc/yum.repos.d/fedora-updates-archive.repo + %files rawhide %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo %config(noreplace) /etc/yum.repos.d/fedora-rawhide-modular.repo @@ -189,6 +202,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %changelog +* Mon Oct 05 2020 Dusty Mabe - 32-7 +- Add the fedora-repos-archive subpackage. + * Tue Aug 25 2020 Adam Williamson - 32-6 - Add missing per-arch symlinks for F34 key diff --git a/fedora-updates-archive.repo b/fedora-updates-archive.repo new file mode 100644 index 0000000..0a66fd1 --- /dev/null +++ b/fedora-updates-archive.repo @@ -0,0 +1,22 @@ +# This is a repo that contains all the old update packages from the +# Fedora updates yum repository (i.e. the packages that have made it +# to "stable"). This repo is needed for OSTree based systems where users +# may be trying to layer packages on top of a base layer that doesn't +# have the latest stable content. Since base layer content is locked +# the package layering operation will fail unless there are older versions +# of packages available. +# +# This repo is given a high cost in order to prefer the normal Fedora +# yum repositories, which means only packages that can't be found +# elsewhere will be downloaded from here. +[updates-archive] +name=Fedora $releasever - $basearch - Updates Archive +baseurl=https://fedoraproject-updates-archive.fedoraproject.org/fedora/$releasever/$basearch/ +enabled=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=True +cost=10000 # default is 1000 From a26353e27f34a085aefe8724684a1cec2300ae04 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 8 Oct 2020 13:51:21 -0400 Subject: [PATCH 16/24] Update ELN repos to include BaseOS and AppStream repositories Signed-off-by: Stephen Gallagher Drop the fedora-eln-modular.repo It no longer exists and the fedora-eln.repo package now contains both BaseOS and AppStream repositories for ELN. Signed-off-by: Stephen Gallagher Add ELN GPG keys Signed-off-by: Stephen Gallagher --- archmap | 2 ++ fedora-eln-modular.repo | 56 --------------------------------------- fedora-eln.repo | 58 +++++++++++++++++++++++++++++++++-------- fedora-repos.spec | 13 +++++---- 4 files changed, 57 insertions(+), 72 deletions(-) delete mode 100644 fedora-eln-modular.repo diff --git a/archmap b/archmap index 3a83fff..2f862a0 100644 --- a/archmap +++ b/archmap @@ -72,3 +72,5 @@ fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x fedora-34-primary: i386 x86_64 armhfp aarch64 ppc64le s390x + +fedora-eln-primary: i386 x86_64 aarch64 ppc64le s390x diff --git a/fedora-eln-modular.repo b/fedora-eln-modular.repo deleted file mode 100644 index 719e1e1..0000000 --- a/fedora-eln-modular.repo +++ /dev/null @@ -1,56 +0,0 @@ -# These packages are untested and still under development. This -# repository is used for development of new releases. -# -# This repository can see significant daily turnover and major -# functionality changes which cause unexpected problems with other -# development packages. Please use these packages if you want to work -# with the Fedora developers by testing these new development packages. -# -# # https://admin.fedoraproject.org/mailman/listinfo/test (Subscription -# Required) is available as a discussion forum for -# testing and troubleshooting for development packages in conjunction -# with new test releases. -# -# More information is available at http://fedoraproject.org/wiki/Testing -# -# Reproducible and reportable issues should be filed at -# http://bugzilla.redhat.com/. -# -# Product: Fedora -# Version: eln-modular - -[eln-modular] -name=Fedora - Modular ELN - Developmental modular packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/$basearch/os/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular&arch=$basearch -enabled=0 -countme=1 -metadata_expire=6h -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[eln-modular-debuginfo] -name=Fedora - Modular ELN - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/x86_64/debug/tree -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-debug&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - -[eln-modular-source] -name=Fedora - Modular ELN - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Modular/source/tree/ -#metalink=https://mirrors.fedoraproject.org/metalink?repo=eln-modular-source&arch=$basearch -enabled=0 -repo_gpgcheck=0 -type=rpm -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch -skip_if_unavailable=False - diff --git a/fedora-eln.repo b/fedora-eln.repo index 78f9bfb..c81fbe4 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -18,12 +18,11 @@ # # Product: Fedora # Version: eln - -[eln] -name=Fedora - ELN - Developmental modular packages for the next Enterprise Linux release -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/$basearch/os/ +[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=1 countme=1 metadata_expire=6h repo_gpgcheck=0 @@ -32,9 +31,9 @@ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=False -[eln-debuginfo] -name=Fedora - ELN - Debug -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/x86_64/debug/tree +[eln-baseos-debuginfo] +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 repo_gpgcheck=0 @@ -43,9 +42,46 @@ gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=False -[eln-source] -name=Fedora - ELN - Source -baseurl=https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Everything/source/tree/ +[eln-baseos-source] +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 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + + + +[eln-appstream] +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 +countme=1 +metadata_expire=6h +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + +[eln-appstream-debuginfo] +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 +repo_gpgcheck=0 +type=rpm +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch +skip_if_unavailable=False + +[eln-appstream-source] +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 repo_gpgcheck=0 diff --git a/fedora-repos.spec b/fedora-repos.spec index 740fff5..7026006 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 7%{?_module_build:%{?dist}} +Release: 8%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -20,6 +20,8 @@ Source4: fedora-updates-testing.repo Source5: fedora-rawhide.repo Source6: fedora-cisco-openh264.repo Source7: fedora-updates-archive.repo +Source8: fedora-eln.repo + Source10: RPM-GPG-KEY-fedora-7-primary Source11: RPM-GPG-KEY-fedora-8-primary @@ -77,9 +79,6 @@ Source150: RPM-GPG-KEY-fedora-iot-2019 Source151: fedora.conf Source152: fedora-compose.conf -Source200: fedora-eln.repo -Source201: fedora-eln-modular.repo - %description Fedora package repository files for yum and dnf along with gpg public keys @@ -144,6 +143,8 @@ 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 +ln -s RPM-GPG-KEY-fedora-%{version}-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) \ @@ -198,10 +199,12 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %files eln %config(noreplace) /etc/yum.repos.d/fedora-eln.repo -%config(noreplace) /etc/yum.repos.d/fedora-eln-modular.repo %changelog +* Tue Oct 13 2020 Stephen Gallagher - 32-8 +- Update the ELN repos for the BaseOS and AppStream split + * Mon Oct 05 2020 Dusty Mabe - 32-7 - Add the fedora-repos-archive subpackage. From f4cdaa1e7a12e13253e9a8353ef419ea1735d17a Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 13 Oct 2020 16:02:47 -0400 Subject: [PATCH 17/24] Add %rawhide_release variable to identify GPG keys Signed-off-by: Stephen Gallagher --- fedora-repos.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 7026006..c1bb911 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,3 +1,5 @@ +%global rawhide_release 34 + Summary: Fedora package repositories Name: fedora-repos Version: 32 @@ -144,7 +146,7 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ # 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 -ln -s RPM-GPG-KEY-fedora-%{version}-primary RPM-GPG-KEY-fedora-eln-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) \ From 7ee726ec2972c025a0916999551e1d02550f3d16 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 13 Oct 2020 16:06:13 -0400 Subject: [PATCH 18/24] Update the release and changelog Signed-off-by: Stephen Gallagher --- fedora-repos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index c1bb911..a2b2dc3 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -3,7 +3,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 8%{?_module_build:%{?dist}} +Release: 9%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -204,6 +204,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %changelog +* Tue Oct 13 2020 Stephen Gallagher - 32-9 +- Ensure that the ELN GPG key always points at the Rawhide key + * Tue Oct 13 2020 Stephen Gallagher - 32-8 - Update the ELN repos for the BaseOS and AppStream split From 7d16c3dc72afa0d3f4156cf90da7f9edde939741 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 13 Oct 2020 17:05:12 -0400 Subject: [PATCH 19/24] ELN repos should be disabled by default on non-Rawhide Signed-off-by: Stephen Gallagher --- fedora-eln.repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-eln.repo b/fedora-eln.repo index c81fbe4..1241e0f 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -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 From b522d19114f7a7d159d5d433a8d731615e6c2cb1 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 13 Oct 2020 17:49:16 -0400 Subject: [PATCH 20/24] Disable eln repos on non rawhide release (sgallagh) Signed-off-by: Mohan Boddu --- fedora-repos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index a2b2dc3..c7aec68 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -3,7 +3,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 9%{?_module_build:%{?dist}} +Release: 10%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -204,6 +204,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %changelog +* Tue Oct 13 2020 Mohan Boddu - 32-10 +- Disable eln repos on non rawhide release (sgallagh) + * Tue Oct 13 2020 Stephen Gallagher - 32-9 - Ensure that the ELN GPG key always points at the Rawhide key From 3b6620da60f03b76d87950d60960c20e52385eec Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 4 Feb 2021 16:43:07 -0500 Subject: [PATCH 21/24] Adding F35 key Signed-off-by: Mohan Boddu --- RPM-GPG-KEY-fedora-35-primary | 29 +++++++++++++++++++++++++++++ fedora-repos.spec | 6 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-35-primary diff --git a/RPM-GPG-KEY-fedora-35-primary b/RPM-GPG-KEY-fedora-35-primary new file mode 100644 index 0000000..899affa --- /dev/null +++ b/RPM-GPG-KEY-fedora-35-primary @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGAcScoBEADLf8YHkezJ6adlMYw7aGGIlJalt8Jj2x/B2K+hIfIuxGtpVj7e +LRgDU76jaT5pVD5mFMJ3pkeneR/cTmqqQkNyQshX2oQXwEzUSb1CNMCfCGgkX8Q2 +zZkrIcCrF0Q2wrKblaudhU+iVanADsm18YEqsb5AU37dtUrM3QYdWg9R+XiPfV8R +KBjT03vVBOdMSsY39LaCn6Ip1Ovp8IEo/IeEVY1qmCOPAaK0bJH3ufg4Cueks+TS +wQWTeCLxuZL6OMXoOPKwvMQfxbg1XD8vuZ0Ktj/cNH2xau0xmsAu9HJpekvOPRxl +yqtjyZfroVieFypwZgvQwtnnM8/gSEu/JVTrY052mEUT7Ccb74kcHFTFfMklnkG/ +0fU4ARa504H3xj0ktbe3vKcPXoPOuKBVsHSv00UGYAyPeuy+87cU/YEhM7k3SVKj +6eIZgyiMO0wl1YGDRKculwks9A+ulkg1oTb4s3zmZvP07GoTxW42jaK5WS+NhZee +860XoVhbc1KpS+jfZojsrEtZ8PbUZ+YvF8RprdWArjHbJk2JpRKAxThxsQAsBhG1 +0Lux2WaMB0g2I5PcMdJ/cqjo08ccrjBXuixWri5iu9MXp8qT/fSzNmsdIgn8/qZK +i8Qulfu77uqhW/wt2btnitgRsqjhxMujYU4Zb4hktF8hKU/XX742qhL5KwARAQAB +tDFGZWRvcmEgKDM1KSA8ZmVkb3JhLTM1LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQJOBBMBCAA4FiEEeH6mrhFH7uVsQLMM20Y5cZhnxY8FAmAcScoCGw8FCwkI +BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ20Y5cZhnxY+NYA/7BYpglySAZYHhjyKh +/+f6zPfVvbH20Eq3kI7OFBN0nLX+BU1muvS+qTuS3WLrB3m3GultpKREJKLtm5ED +1rGzXAoT1yp9YI8LADdMCCOyjAjsoWU87YUuC+/bnjrTeR2LROCfyPC76W985iOV +m5S+bsQDw7C2LrldAM4MDuoyZ1SitGaZ4KQLVt+TEa14isYSGCjzo7PY8V3JOk50 +gqWg82N/bm2EzS7T83WEDb1lvj4IlvxgIqKeg11zXYxmrYSZJJCfvzf+lNS6uxgH +jx/J0ylZ2LibGr6GAAyO9UWrAZSwSM0EcjT8wECnxkSDuyqmWwVvNBXuEIV8Oe3Y +MiU1fJN8sd7DpsFx5M+XdnMnQS+HrjTPKD3mWrlAdnEThdYV8jZkpWhDys3/99eO +hk0rLny0jNwkauf/iU8Oc6XvMkjLRMJg5U9VKyJuWWtzwXnjMN5WRFBqK4sZomMM +ftbTH1+5ybRW/A3vBbaxRW2t7UzNjczekSZEiaLN9L/HcJCIR1QF8682DdAlEF9d +k2gQiYSQAaaJ0JJAzHvRkRJLLgK2YQYiHNVy2t3JyFfsram5wSCWOfhPeIyLBTZJ +vrpNlPbefsT957Tf2BNIugzZrC5VxDSKkZgRh1VGvSIQnCyzkQy6EU2qPpiW59G/ +hPIXZrKocK3KLS9/izJQTRltjMA= +=PfT7 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/fedora-repos.spec b/fedora-repos.spec index c7aec68..e4f96b8 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -3,7 +3,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 10%{?_module_build:%{?dist}} +Release: 11%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -70,6 +70,7 @@ Source51: RPM-GPG-KEY-fedora-31-primary 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 Source100: fedora-modular.repo Source101: fedora-updates-modular.repo @@ -204,6 +205,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %changelog +* Thu Feb 04 2021 Mohan Boddu - 32-11 +- Adding F35 key + * Tue Oct 13 2020 Mohan Boddu - 32-10 - Disable eln repos on non rawhide release (sgallagh) From 40717b8856efebcb725f34b625828ec40a57ca5b Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 9 Feb 2021 09:50:59 -0500 Subject: [PATCH 22/24] Fixing archmap for F35 Signed-off-by: Mohan Boddu --- archmap | 2 ++ fedora-repos.spec | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/archmap b/archmap index 2f862a0..e80ecbd 100644 --- a/archmap +++ b/archmap @@ -73,4 +73,6 @@ fedora-33-primary: i386 x86_64 armhfp aarch64 ppc64le s390x 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 diff --git a/fedora-repos.spec b/fedora-repos.spec index e4f96b8..0c5b7a1 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -3,7 +3,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 32 -Release: 11%{?_module_build:%{?dist}} +Release: 12%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -205,6 +205,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %changelog +* Tue Feb 09 2021 Mohan Boddu - 32-12 +- Fixing archmap for F35 + * Thu Feb 04 2021 Mohan Boddu - 32-11 - Adding F35 key From f9c3d5b5e44332069fcaf7e090b9b77baceb8948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Mon, 22 Feb 2021 18:27:26 +0100 Subject: [PATCH 23/24] sync with Rawhide Most importantly the RPM-GPG-KEY-fedora-rawhide-primary symlink. --- RPM-GPG-KEY-fedora-36-primary | 29 +++++++++++++++ archmap | 7 +++- fedora-repos.spec | 70 ++++++++++++++++++++++++++++++++--- 3 files changed, 98 insertions(+), 8 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-repos.spec b/fedora-repos.spec index 0c5b7a1..9822ecb 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: 32 -Release: 12%{?_module_build:%{?dist}} +Release: 13%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -71,6 +71,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 @@ -146,12 +150,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 % @@ -161,6 +171,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 @@ -171,6 +192,40 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/ostree/remotes.d/ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ + +%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 + %if %{rawhide_release} == %{version} + grep 'enabled=1' $repo + %else + grep 'enabled=1' $repo && exit 1 || : + %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 %config(noreplace) /etc/yum.repos.d/fedora.repo @@ -205,6 +260,9 @@ install -m 644 %{_sourcedir}/fedora-compose.conf $RPM_BUILD_ROOT/etc/ostree/remo %changelog +* Mon Feb 22 2021 Kamil Páral - 32-13 +- sync with Rawhide (mainly gpg keys) + * Tue Feb 09 2021 Mohan Boddu - 32-12 - Fixing archmap for F35 From 1ccf176a93990eb56ea849be1fe552391e5692c3 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 24/24] 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 | 12 ++- fedora-modular.repo | 8 +- fedora-rawhide-modular.repo | 13 +-- fedora-rawhide.repo | 13 +-- fedora-repos.spec | 128 +++++++++++++++++++++++----- fedora-updates-archive.repo | 2 +- fedora-updates-modular.repo | 2 +- fedora-updates-testing-modular.repo | 2 +- fedora-updates-testing.repo | 2 +- fedora-updates.repo | 2 +- fedora.repo | 8 +- 11 files changed, 144 insertions(+), 48 deletions(-) diff --git a/fedora-eln.repo b/fedora-eln.repo index 1241e0f..c6b7f44 100644 --- a/fedora-eln.repo +++ b/fedora-eln.repo @@ -11,18 +11,19 @@ # 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/. # # 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,9 +88,9 @@ 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 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch skip_if_unavailable=False - 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 9822ecb..97a7d8d 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,4 +1,5 @@ %global rawhide_release 35 +%global updates_testing_enabled 0 Summary: Fedora package repositories Name: fedora-repos @@ -96,6 +97,9 @@ Obsoletes: fedora-release-rawhide <= 22-0.3 Obsoletes: fedora-repos-rawhide-modular < 29-0.6 Provides: fedora-repos-rawhide-modular = %{version}-%{release} +%description rawhide +This package provides the rawhide repo definitions. + %package archive Summary: Fedora updates archive package repository Requires: fedora-repos = %{version}-%{release} @@ -105,10 +109,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 -n fedora-gpg-keys Summary: Fedora RPM keys Obsoletes: fedora-release-rawhide <= 22-0.3 @@ -171,20 +171,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 @@ -194,23 +225,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,eln}*.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-archive.repo b/fedora-updates-archive.repo index 0a66fd1..4cc3551 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=1 +enabled=0 metadata_expire=6h repo_gpgcheck=0 type=rpm 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 5cd78af..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=0 +enabled=AUTO_VALUE countme=1 repo_gpgcheck=0 type=rpm diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 9306abb..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=0 +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 f9bfbb1..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