From 1e8091da5644c691a1436997c055e249c1918271 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 19 Feb 2019 19:58:13 +0100 Subject: [PATCH 01/10] Branching F30 from rawhide Signed-off-by: Tomas Hrcka --- archmap | 2 ++ 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 +- fedora.repo | 2 +- 10 files changed, 15 insertions(+), 9 deletions(-) diff --git a/archmap b/archmap index c11e58b..1a76a79 100644 --- a/archmap +++ b/archmap @@ -63,4 +63,6 @@ fedora-29-primary: i386 x86_64 armhfp aarch64 ppc64 ppc64le s390x fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x +fedora-31-primary: i386 x86_64 armhfp aarch64 ppc64le s390x + fedora-iot-2019: i386 x86_64 armhfp aarch64 ppc64le s390x diff --git a/fedora-modular.repo b/fedora-modular.repo index 46f78e6..d60efce 100644 --- a/fedora-modular.repo +++ b/fedora-modular.repo @@ -2,7 +2,7 @@ name=Fedora Modular $releasever - $basearch #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch -enabled=0 +enabled=1 #metadata_expire=7d repo_gpgcheck=0 type=rpm diff --git a/fedora-rawhide-modular.repo b/fedora-rawhide-modular.repo index 9d0a63c..27d40b3 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.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch -enabled=1 +enabled=0 metadata_expire=6h repo_gpgcheck=0 type=rpm diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo index 445b5da..3d66772 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.fedoraproject.org/pub/fedora/linux/development/rawhide//Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch -enabled=1 +enabled=0 metadata_expire=6h repo_gpgcheck=0 type=rpm diff --git a/fedora-repos.spec b/fedora-repos.spec index 80c1524..b82174e 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 30 -Release: 0.4%{?_module_build:%{?dist}} +Release: 0.5%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -149,6 +149,10 @@ done %changelog +* Tue Feb 19 2019 Tomas Hrcka - 30-0.5 +- Disable rawhide and rawhide-modular +- Enable fedora, updates, updates-testing repositories + * Mon Feb 18 2019 Mohan Boddu - 30-0.4 - Adding F31 key diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo index c5b739f..0aab711 100644 --- a/fedora-updates-modular.repo +++ b/fedora-updates-modular.repo @@ -3,7 +3,7 @@ name=Fedora Modular $releasever - $basearch - Updates failovermethod=priority #baseurl=http://download.fedoraproject.org/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 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo index 2be7ad0..97673d1 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.fedoraproject.org/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 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 21e0812..85a9363 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch - Test Updates #baseurl=http://download.fedoraproject.org/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 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-updates.repo b/fedora-updates.repo index 4d5812a..5f4395d 100644 --- a/fedora-updates.repo +++ b/fedora-updates.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch - Updates #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch -enabled=0 +enabled=1 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora.repo b/fedora.repo index faf643e..26c7868 100644 --- a/fedora.repo +++ b/fedora.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch -enabled=0 +enabled=1 #metadata_expire=7d repo_gpgcheck=0 type=rpm From 150785a389c41813e4ab329cd130380a688e14a1 Mon Sep 17 00:00:00 2001 From: Sinny Kumari Date: Mon, 4 Mar 2019 17:55:22 +0530 Subject: [PATCH 02/10] Create fedora-repos-ostree sub-package Related- https://github.com/coreos/fedora-coreos-tracker/issues/143 Signed-off-by: Sinny Kumari --- fedora-repos.spec | 18 +++++++++++++++++- fedora.conf | 5 +++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 fedora.conf diff --git a/fedora-repos.spec b/fedora-repos.spec index b82174e..553bb8a 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 30 -Release: 0.5%{?_module_build:%{?dist}} +Release: 0.6%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -71,6 +71,7 @@ Source103: fedora-rawhide-modular.repo Source104: RPM-GPG-KEY-fedora-modularity Source150: RPM-GPG-KEY-fedora-iot-2019 +Source151: fedora.conf %description Fedora package repository files for yum and dnf along with gpg public keys @@ -93,6 +94,12 @@ Obsoletes: fedora-release-rawhide <= 22-0.3 %description -n fedora-gpg-keys This package provides the RPM signature keys. +%package ostree +Summary: OSTree specific files + +%description ostree +This package provides ostree specfic files like remote config from +where client's system will pull OSTree updates. %prep @@ -126,6 +133,9 @@ for file in %{_sourcedir}/fedora*repo ; do install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d 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/ %files %dir /etc/yum.repos.d @@ -147,8 +157,14 @@ done %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/RPM-GPG-KEY-* +%files ostree +%dir /etc/ostree/remotes.d/ +/etc/ostree/remotes.d/fedora.conf %changelog +* Mon Mar 04 2019 Sinny Kumari - 30-0.6 +- Create fedora-repos-ostree sub-package + * Tue Feb 19 2019 Tomas Hrcka - 30-0.5 - Disable rawhide and rawhide-modular - Enable fedora, updates, updates-testing repositories diff --git a/fedora.conf b/fedora.conf new file mode 100644 index 0000000..3d23f22 --- /dev/null +++ b/fedora.conf @@ -0,0 +1,5 @@ +[remote "fedora"] +url=https://ostree.fedoraproject.org +gpg-verify=true +gpgkeypath=/etc/pki/rpm-gpg/ +contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist From f3ac40b647ced2a743180c826beaba33bb535d63 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 12 Mar 2019 12:35:32 -0400 Subject: [PATCH 03/10] Dont pull in fedora-repos-rawhide Fix for BZ #1687921 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 553bb8a..43167c6 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 @@ -164,6 +163,7 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ %changelog * Mon Mar 04 2019 Sinny Kumari - 30-0.6 - Create fedora-repos-ostree sub-package +- Dont pull in fedora-repos-rawhide (mohanboddu) * Tue Feb 19 2019 Tomas Hrcka - 30-0.5 - Disable rawhide and rawhide-modular From 28f061d62768cebea102361d56ad4b62a25b647a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 18 Apr 2019 14:03:53 -0400 Subject: [PATCH 04/10] Setup for F30 Final Signed-off-by: Mohan Boddu --- fedora-repos.spec | 5 ++++- fedora-updates-testing-modular.repo | 2 +- fedora-updates-testing.repo | 2 +- fedora.repo | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fedora-repos.spec b/fedora-repos.spec index 43167c6..ba04091 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 30 -Release: 0.6%{?_module_build:%{?dist}} +Release: 1%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -161,6 +161,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Thu Apr 18 2019 Mohan Boddu - 30-1 +- Setup for F30 Final + * Mon Mar 04 2019 Sinny Kumari - 30-0.6 - Create fedora-repos-ostree sub-package - Dont pull in fedora-repos-rawhide (mohanboddu) diff --git a/fedora-updates-testing-modular.repo b/fedora-updates-testing-modular.repo index 97673d1..2be7ad0 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.fedoraproject.org/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 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo index 85a9363..21e0812 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -2,7 +2,7 @@ name=Fedora $releasever - $basearch - Test Updates #baseurl=http://download.fedoraproject.org/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 repo_gpgcheck=0 type=rpm gpgcheck=1 diff --git a/fedora.repo b/fedora.repo index 26c7868..6e92079 100644 --- a/fedora.repo +++ b/fedora.repo @@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch enabled=1 -#metadata_expire=7d +metadata_expire=7d repo_gpgcheck=0 type=rpm gpgcheck=1 From f64dbf9fc86812a438033bc2d93a6d4287dea109 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 19 Aug 2019 08:55:13 -0700 Subject: [PATCH 05/10] Add the f32 key to fedora 30 release. Signed-off-by: Kevin Fenzi --- RPM-GPG-KEY-fedora-32-primary | 28 ++++++++++++++++++++++++++++ archmap | 2 ++ fedora-repos.spec | 6 +++++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 RPM-GPG-KEY-fedora-32-primary diff --git a/RPM-GPG-KEY-fedora-32-primary b/RPM-GPG-KEY-fedora-32-primary new file mode 100644 index 0000000..67bde34 --- /dev/null +++ b/RPM-GPG-KEY-fedora-32-primary @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBF1RVqsBEADWMBqYv/G1r4PwyiPQCfg5fXFGXV1FCZ32qMi9gLUTv1CX7rYy +H4Inj93oic+lt1kQ0kQCkINOwQczOkm6XDkEekmMrHknJpFLwrTK4AS28bYF2RjL +M+QJ/dGXDMPYsP0tkLvoxaHr9WTRq89A+AmONcUAQIMJg3JxXAAafBi2UszUUEPI +U35MyufFt2ePd1k/6hVAO8S2VT72TxXSY7Ha4X2J0pGzbqQ6Dq3AVzogsnoIi09A +7fYutYZPVVAEGRUqavl0th8LyuZShASZ38CdAHBMvWV4bVZghd/wDV5ev3LXUE0o +itLAqNSeiDJ3grKWN6v0qdU0l3Ya60sugABd3xaE+ROe8kDCy3WmAaO51Q880ZA2 +iXOTJFObqkBTP9j9+ZeQ+KNE8SBoiH1EybKtBU8HmygZvu8ZC1TKUyL5gwGUJt8v +ergy5Bw3Q7av520sNGD3cIWr4fBAVYwdBoZT8RcsnU1PP67NmOGFcwSFJ/LpiOMC +pZ1IBvjOC7KyKEZY2/63kjW73mB7OHOd18BHtGVkA3QAdVlcSule/z68VOAy6bih +E6mdxP28D4INsts8w6yr4G+3aEIN8u0qRQq66Ri5mOXTyle+ONudtfGg3U9lgicg +z6oVk17RT0jV9uL6K41sGZ1sH/6yTXQKagdAYr3w1ix2L46JgzC+/+6SSwARAQAB +tDFGZWRvcmEgKDMyKSA8ZmVkb3JhLTMyLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v +cmc+iQI4BBMBAgAiBQJdUVarAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAK +CRBsEwJtEslE0LdAD/wKdAMtfzr7O2y06/sOPnrb3D39Y2DXbB8y0iEmRdBL29Bq +5btxwmAka7JZRJVFxPsOVqZ6KARjS0/oCBmJc0jCRANFCtM4UjVHTSsxrJfuPkel +vrlNE9tcR6OCRpuj/PZgUa39iifF/FTUfDgh4Q91xiQoLqfBxOJzravQHoK9VzrM +NTOu6J6l4zeGzY/ocj6DpT+5fdUO/3HgGFNiNYPC6GVzeiA3AAVR0sCyGENuqqdg +wUxV3BIht05M5Wcdvxg1U9x5I3yjkLQw+idvX4pevTiCh9/0u+4g80cT/21Cxsdx +7+DVHaewXbF87QQIcOAing0S5QE67r2uPVxmWy/56TKUqDoyP8SNsV62lT2jutsj +LevNxUky011g5w3bc61UeaeKrrurFdRs+RwBVkXmtqm/i6g0ZTWZyWGO6gJd+HWA +qY1NYiq4+cMvNLatmA2sOoCsRNmE9q6jM/ESVgaH8hSp8GcLuzt9/r4PZZGl5CvU +eldOiD221u8rzuHmLs4dsgwJJ9pgLT0cUAsOpbMPI0JpGIPQ2SG6yK7LmO6HFOxb +Akz7IGUt0gy1MzPTyBvnB+WgD1I+IQXXsJbhP5+d+d3mOnqsd6oDM/grKBzrhoUe +oNadc9uzjqKlOrmrdIR3Bz38SSiWlde5fu6xPqJdmGZRNjXtcyJlbSPVDIloxw== +=QWRO +-----END PGP PUBLIC KEY BLOCK----- diff --git a/archmap b/archmap index 1a76a79..72ad2ef 100644 --- a/archmap +++ b/archmap @@ -65,4 +65,6 @@ fedora-30-primary: i386 x86_64 armhfp aarch64 ppc64le s390x fedora-31-primary: i386 x86_64 armhfp aarch64 ppc64le s390x +fedora-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x + fedora-iot-2019: i386 x86_64 armhfp aarch64 ppc64le s390x diff --git a/fedora-repos.spec b/fedora-repos.spec index ba04091..a830a7f 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 30 -Release: 1%{?_module_build:%{?dist}} +Release: 2%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -62,6 +62,7 @@ Source48: RPM-GPG-KEY-fedora-28-primary Source49: RPM-GPG-KEY-fedora-29-primary Source50: RPM-GPG-KEY-fedora-30-primary Source51: RPM-GPG-KEY-fedora-31-primary +Source52: RPM-GPG-KEY-fedora-32-primary Source100: fedora-modular.repo Source101: fedora-updates-modular.repo @@ -161,6 +162,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Mon Aug 19 2019 Kevin Fenzi - 30-2 +- Add F32 key. + * Thu Apr 18 2019 Mohan Boddu - 30-1 - Setup for F30 Final From 9661d854009743f1f224ed981982527fc8312b57 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 10 Feb 2020 14:37:04 +0100 Subject: [PATCH 06/10] Remove baseurl download.fp.o We want to discourage people from using download.fedoraproject.org, so hopefully we get less people to use it for package downloads by not "advertising" it as an option in the repo files. It is vastly suboptimal to using metalink for all parties involved. Signed-off-by: Patrick Uiterwijk --- 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 deletions(-) diff --git a/fedora-modular.repo b/fedora-modular.repo index d60efce..b29ede9 100644 --- a/fedora-modular.repo +++ b/fedora-modular.repo @@ -1,6 +1,5 @@ [fedora-modular] name=Fedora Modular $releasever - $basearch -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch enabled=1 #metadata_expire=7d @@ -12,7 +11,6 @@ skip_if_unavailable=False [fedora-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Debug -#baseurl=http://download.fedoraproject.org/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 @@ -24,7 +22,6 @@ skip_if_unavailable=False [fedora-modular-source] name=Fedora Modular $releasever - Source -#baseurl=http://download.fedoraproject.org/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 27d40b3..89d68cf 100644 --- a/fedora-rawhide-modular.repo +++ b/fedora-rawhide-modular.repo @@ -21,7 +21,6 @@ [rawhide-modular] name=Fedora - Modular Rawhide - Developmental packages for the next Fedora release -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Modular/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch enabled=0 metadata_expire=6h @@ -33,7 +32,6 @@ skip_if_unavailable=False [rawhide-modular-debuginfo] name=Fedora - Modular Rawhide - Debug -#baseurl=http://download.fedoraproject.org/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 @@ -44,7 +42,6 @@ skip_if_unavailable=False [rawhide-modular-source] name=Fedora - Modular Rawhide - Source -#baseurl=http://download.fedoraproject.org/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 3d66772..e7f403b 100644 --- a/fedora-rawhide.repo +++ b/fedora-rawhide.repo @@ -21,7 +21,6 @@ [rawhide] name=Fedora - Rawhide - Developmental packages for the next Fedora release -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide//Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch enabled=0 metadata_expire=6h @@ -33,7 +32,6 @@ skip_if_unavailable=False [rawhide-debuginfo] name=Fedora - Rawhide - Debug -#baseurl=http://download.fedoraproject.org/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 @@ -44,7 +42,6 @@ skip_if_unavailable=False [rawhide-source] name=Fedora - Rawhide - Source -#baseurl=http://download.fedoraproject.org/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 0aab711..d82088b 100644 --- a/fedora-updates-modular.repo +++ b/fedora-updates-modular.repo @@ -1,7 +1,6 @@ [updates-modular] name=Fedora Modular $releasever - $basearch - Updates failovermethod=priority -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch enabled=1 repo_gpgcheck=0 @@ -14,7 +13,6 @@ skip_if_unavailable=False [updates-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Updates - Debug failovermethod=priority -#baseurl=http://download.fedoraproject.org/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 @@ -27,7 +25,6 @@ skip_if_unavailable=False [updates-modular-source] name=Fedora Modular $releasever - Updates Source failovermethod=priority -#baseurl=http://download.fedoraproject.org/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 2be7ad0..2199e86 100644 --- a/fedora-updates-testing-modular.repo +++ b/fedora-updates-testing-modular.repo @@ -1,6 +1,5 @@ [updates-testing-modular] name=Fedora Modular $releasever - $basearch - Test Updates -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-modular-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 @@ -12,7 +11,6 @@ skip_if_unavailable=False [updates-testing-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Test Updates Debug -#baseurl=http://download.fedoraproject.org/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 @@ -24,7 +22,6 @@ skip_if_unavailable=False [updates-testing-modular-source] name=Fedora Modular $releasever - Test Updates Source -#baseurl=http://download.fedoraproject.org/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 21e0812..32c0794 100644 --- a/fedora-updates-testing.repo +++ b/fedora-updates-testing.repo @@ -1,6 +1,5 @@ [updates-testing] name=Fedora $releasever - $basearch - Test Updates -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 @@ -12,7 +11,6 @@ skip_if_unavailable=False [updates-testing-debuginfo] name=Fedora $releasever - $basearch - Test Updates Debug -#baseurl=http://download.fedoraproject.org/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 @@ -24,7 +22,6 @@ skip_if_unavailable=False [updates-testing-source] name=Fedora $releasever - Test Updates Source -#baseurl=http://download.fedoraproject.org/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 5f4395d..4b18e98 100644 --- a/fedora-updates.repo +++ b/fedora-updates.repo @@ -1,6 +1,5 @@ [updates] name=Fedora $releasever - $basearch - Updates -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/ metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch enabled=1 repo_gpgcheck=0 @@ -12,7 +11,6 @@ skip_if_unavailable=False [updates-debuginfo] name=Fedora $releasever - $basearch - Updates - Debug -#baseurl=http://download.fedoraproject.org/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 @@ -24,7 +22,6 @@ skip_if_unavailable=False [updates-source] name=Fedora $releasever - Updates Source -#baseurl=http://download.fedoraproject.org/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 6e92079..7946e6f 100644 --- a/fedora.repo +++ b/fedora.repo @@ -1,6 +1,5 @@ [fedora] name=Fedora $releasever - $basearch -#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch enabled=1 metadata_expire=7d @@ -12,7 +11,6 @@ skip_if_unavailable=False [fedora-debuginfo] name=Fedora $releasever - $basearch - Debug -#baseurl=http://download.fedoraproject.org/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 @@ -24,7 +22,6 @@ skip_if_unavailable=False [fedora-source] name=Fedora $releasever - Source -#baseurl=http://download.fedoraproject.org/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 f16e00b23227d5c362c16c1b211193b429c3ef4c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 9 Mar 2020 18:03:05 -0700 Subject: [PATCH 07/10] Drop the failovermethod in f30 modular repos as well. See https://bugzilla.redhat.com/show_bug.cgi?id=1770619 Signed-off-by: Kevin Fenzi --- fedora-updates-modular.repo | 3 --- 1 file changed, 3 deletions(-) diff --git a/fedora-updates-modular.repo b/fedora-updates-modular.repo index d82088b..d7b4bd9 100644 --- a/fedora-updates-modular.repo +++ b/fedora-updates-modular.repo @@ -1,6 +1,5 @@ [updates-modular] name=Fedora Modular $releasever - $basearch - Updates -failovermethod=priority metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch enabled=1 repo_gpgcheck=0 @@ -12,7 +11,6 @@ skip_if_unavailable=False [updates-modular-debuginfo] name=Fedora Modular $releasever - $basearch - Updates - Debug -failovermethod=priority metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-debug-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 @@ -24,7 +22,6 @@ skip_if_unavailable=False [updates-modular-source] name=Fedora Modular $releasever - Updates Source -failovermethod=priority metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-source-f$releasever&arch=$basearch enabled=0 repo_gpgcheck=0 From a9db90a0e1daee921285f57bbd61a7a97fa7971a Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 23 Mar 2020 14:27:53 -0400 Subject: [PATCH 08/10] Drop the failovermethod in f30 modular repos as well. 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 a830a7f..efe1e6b 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 30 -Release: 2%{?_module_build:%{?dist}} +Release: 3%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -162,6 +162,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Mon Mar 23 2020 Kevin Fenzi - 30-3 +- Drop the failovermethod in f30 modular repos as well. + * Mon Aug 19 2019 Kevin Fenzi - 30-2 - Add F32 key. From f5ce47557464face7ca8780f6ba11812aa1a7cb0 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 18 Feb 2020 09:47:29 -0800 Subject: [PATCH 09/10] 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 b29ede9..cab9c11 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 #metadata_expire=7d @@ -11,6 +12,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 @@ -22,6 +24,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 89d68cf..9de0bf7 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 metadata_expire=6h @@ -32,6 +33,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 @@ -42,6 +44,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 e7f403b..72117a4 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 metadata_expire=6h @@ -32,6 +33,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 @@ -42,6 +44,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 d7b4bd9..88d9edb 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 repo_gpgcheck=0 @@ -11,6 +12,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 @@ -22,6 +24,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 2199e86..9edd7af 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=0 repo_gpgcheck=0 @@ -11,6 +12,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 @@ -22,6 +24,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 32c0794..3e78451 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=0 repo_gpgcheck=0 @@ -11,6 +12,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 @@ -22,6 +24,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 4b18e98..0f34cb1 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 repo_gpgcheck=0 @@ -11,6 +12,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 @@ -22,6 +24,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 7946e6f..8c3a3e4 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 metadata_expire=7d @@ -11,6 +12,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 @@ -22,6 +24,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 d343a9676a5133bd7922ac5d4f819b8c88683523 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 17 Apr 2020 18:07:09 -0700 Subject: [PATCH 10/10] Bump release 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 efe1e6b..e6cad87 100644 --- a/fedora-repos.spec +++ b/fedora-repos.spec @@ -1,7 +1,7 @@ Summary: Fedora package repositories Name: fedora-repos Version: 30 -Release: 3%{?_module_build:%{?dist}} +Release: 4%{?_module_build:%{?dist}} License: MIT URL: https://fedoraproject.org/ @@ -162,6 +162,9 @@ install -m 644 %{_sourcedir}/fedora.conf $RPM_BUILD_ROOT/etc/ostree/remotes.d/ /etc/ostree/remotes.d/fedora.conf %changelog +* Fri Apr 17 2020 Adam Williamson - 30-4 +- Re-add baseurl lines, but using example domain + * Mon Mar 23 2020 Kevin Fenzi - 30-3 - Drop the failovermethod in f30 modular repos as well.