Compare commits

...
Sign in to create a new pull request.

10 commits

Author SHA1 Message Date
Adam Williamson
d343a9676a Bump release
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-04-17 18:07:09 -07:00
Adam Williamson
f5ce475574 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 <awilliam@redhat.com>
2020-04-17 18:06:34 -07:00
Mohan Boddu
a9db90a0e1 Drop the failovermethod in f30 modular repos as well.
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-03-23 14:27:53 -04:00
Kevin Fenzi
f16e00b232 Drop the failovermethod in f30 modular repos as well.
See https://bugzilla.redhat.com/show_bug.cgi?id=1770619

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2020-03-09 18:03:05 -07:00
Patrick Uiterwijk
9661d85400 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 <patrick@puiterwijk.org>
2020-02-10 15:51:18 +01:00
Kevin Fenzi
f64dbf9fc8 Add the f32 key to fedora 30 release.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-08-19 09:15:56 -07:00
Mohan Boddu
28f061d627 Setup for F30 Final
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-04-18 14:03:53 -04:00
Mohan Boddu
f3ac40b647 Dont pull in fedora-repos-rawhide
Fix for BZ #1687921

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-03-13 13:23:15 -04:00
Sinny Kumari
150785a389 Create fedora-repos-ostree sub-package
Related- https://github.com/coreos/fedora-coreos-tracker/issues/143

Signed-off-by: Sinny Kumari <sinny@redhat.com>
2019-03-07 16:13:42 +05:30
1e8091da56 Branching F30 from rawhide
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2019-02-19 20:17:42 +01:00
12 changed files with 103 additions and 36 deletions

View file

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

View file

@ -63,4 +63,8 @@ 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-32-primary: i386 x86_64 armhfp aarch64 ppc64le s390x
fedora-iot-2019: i386 x86_64 armhfp aarch64 ppc64le s390x

View file

@ -1,8 +1,8 @@
[fedora-modular]
name=Fedora Modular $releasever - $basearch
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
enabled=0
enabled=1
#metadata_expire=7d
repo_gpgcheck=0
type=rpm
@ -12,7 +12,7 @@ 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/
#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
@ -24,7 +24,7 @@ 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/
#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

View file

@ -21,9 +21,9 @@
[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/
#baseurl=http://download.example/pub/fedora/linux/development/rawhide/Modular/$basearch/os/
metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide-modular&arch=$basearch
enabled=1
enabled=0
metadata_expire=6h
repo_gpgcheck=0
type=rpm
@ -33,7 +33,7 @@ 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/
#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
@ -44,7 +44,7 @@ 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/
#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

View file

@ -21,9 +21,9 @@
[rawhide]
name=Fedora - Rawhide - Developmental packages for the next Fedora release
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
#baseurl=http://download.example/pub/fedora/linux/development/rawhide//Everything/$basearch/os/
metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
enabled=1
enabled=0
metadata_expire=6h
repo_gpgcheck=0
type=rpm
@ -33,7 +33,7 @@ skip_if_unavailable=False
[rawhide-debuginfo]
name=Fedora - Rawhide - Debug
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/$basearch/debug/tree/
#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
@ -44,7 +44,7 @@ skip_if_unavailable=False
[rawhide-source]
name=Fedora - Rawhide - Source
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/
#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

View file

@ -1,13 +1,12 @@
Summary: Fedora package repositories
Name: fedora-repos
Version: 30
Release: 0.4%{?_module_build:%{?dist}}
Release: 4%{?_module_build:%{?dist}}
License: MIT
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
@ -63,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
@ -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,31 @@ 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
* Fri Apr 17 2020 Adam Williamson <awilliam@redhat.com> - 30-4
- Re-add baseurl lines, but using example domain
* Mon Mar 23 2020 Kevin Fenzi <kevin@scrye.com> - 30-3
- Drop the failovermethod in f30 modular repos as well.
* Mon Aug 19 2019 Kevin Fenzi <kevin@scrye.com> - 30-2
- Add F32 key.
* Thu Apr 18 2019 Mohan Boddu <mboddu@bhujji.com> - 30-1
- Setup for F30 Final
* Mon Mar 04 2019 Sinny Kumari <skumari@redhat.com> - 30-0.6
- Create fedora-repos-ostree sub-package
- Dont pull in fedora-repos-rawhide (mohanboddu)
* Tue Feb 19 2019 Tomas Hrcka <thrcka@redhat.com> - 30-0.5
- Disable rawhide and rawhide-modular
- Enable fedora, updates, updates-testing repositories
* Mon Feb 18 2019 Mohan Boddu <mboddu@bhujji.com> - 30-0.4
- Adding F31 key

View file

@ -1,9 +1,8 @@
[updates-modular]
name=Fedora Modular $releasever - $basearch - Updates
failovermethod=priority
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Modular/$basearch/
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
enabled=0
enabled=1
repo_gpgcheck=0
type=rpm
gpgcheck=1
@ -13,8 +12,7 @@ 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/
#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
@ -26,8 +24,7 @@ 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/
#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

View file

@ -1,6 +1,6 @@
[updates-testing-modular]
name=Fedora Modular $releasever - $basearch - Test Updates
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
#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
@ -12,7 +12,7 @@ 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/
#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
@ -24,7 +24,7 @@ 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/
#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

View file

@ -1,6 +1,6 @@
[updates-testing]
name=Fedora $releasever - $basearch - Test Updates
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Everything/$basearch/
#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
@ -12,7 +12,7 @@ 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/
#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
@ -24,7 +24,7 @@ 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/
#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

View file

@ -1,8 +1,8 @@
[updates]
name=Fedora $releasever - $basearch - Updates
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/
#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
enabled=0
enabled=1
repo_gpgcheck=0
type=rpm
gpgcheck=1
@ -12,7 +12,7 @@ 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/
#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
@ -24,7 +24,7 @@ skip_if_unavailable=False
[updates-source]
name=Fedora $releasever - Updates Source
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
#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

5
fedora.conf Normal file
View file

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

View file

@ -1,9 +1,9 @@
[fedora]
name=Fedora $releasever - $basearch
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
enabled=0
#metadata_expire=7d
enabled=1
metadata_expire=7d
repo_gpgcheck=0
type=rpm
gpgcheck=1
@ -12,7 +12,7 @@ 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/
#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
@ -24,7 +24,7 @@ skip_if_unavailable=False
[fedora-source]
name=Fedora $releasever - Source
#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/tree/
#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