Fix the Source52 to be fedora 32

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
Add the f32 key to fedora 29
2019-08-19 18:50:25 +01:00 · 2019-08-19 10:05:10 -07:00 · 2019-03-19 08:26:18 +05:30 · 2019-03-13 15:02:35 -04:00 · 2019-02-18 14:02:51 -05:00 · 2018-11-14 09:47:12 -05:00
13 changed files with 157 additions and 11 deletions
--- a/29
+++ b/29
@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFxq3QMBEADUhGfCfP1ijiggBuVbR/pBDSWMC3TWbfC8pt7fhZkYrilzfWUM
+fTsikPymSriScONXP6DNyZ5r7tgrIVdVrJvRIqIFRO0mufp9HyfWKDO//Ctyp7OQ
+zYw6NVthO/aWpyFfJpj6s4iZsYGqf9gByV8brBB8v8jEsCtVOj1BU3bMbLkMsRI9
+WiLjDYyvopqNBQuIe8ogxSxpYdbUz6+jxzfvhRoBzWdjITd//Gjd90kkrBOMWkO
+LTqO133OD1WMT08G5NuQ4KhjYsVvSbBpfdkTcNuP8gBP9LxCQDc+e1eAhZ95g3qk
+XLeKEK9j+F+wuG/OrEAxBsscCxXRUB38QH6CFe3UxGoSMnBi+jEhicudo+ItpFOy
+7rPaYyRh4Pmu4QHcC83bNjp8NI6zTHrBmVuPqkxMn07GMAQav9ezBXj6umqTX4cU
+dsJUavJrJ3u7rT0lhBdiGrQ9zPbL07u2Kn+OXPAC3dKSf7G8TvwNAdry9esGSpi3
+8aa1myQYVZvAlsIBkbN3fb1wvDJE5czVhzwQ77V2t66jxeg0o9/2OZVH3CozD2Zj
+v28LHuW/jnQHtsQ0fUyQYRmHxNEVkW10GGM7fQwxzpxFFS1O/2XEnfMu7yBHZsgL
+SojfUct0FhLhEN/g/IINX9ZCVrzK5/De27CNjYE1cgYD/lTmQ0SyjfKVwwARAQAB
+tDFGZWRvcmEgKDMxKSA8ZmVkb3JhLTMxLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQI+BBMBAgAoAhsPBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCXGrkTQUJ
+Es8P/QAKCRBQyzkLPDNZxBmDD/90IFwAfFcQq5ENl7/o2CYQ9k2adTHbV5RoIOWC
+/o9I5/btn1y8WDhPOUNmsgbUqRqz6srlVplg+LkpIj67PVLDBwpVbCJC8o1fztd2
+MryVqdvu562WVhUorII+iW7nfqD0yv55nH9b/JR1qloUa8LpeKw84JgvxF5wVfyR
+id1WjI0DBk2taFR4xCfU5Tb262fbdFj5iB9xskP7oNeS29+SfDjlnybtlFoqr9UA
+nY1uvhBPkGmj45SJkpfP+L+kGYXVaUd29M/q/Pt46X1KDvr6Z0l8bSUEk3zfcNdj
+uEhtHBqSy1UPPAikGX1Q5wGdu7R7+mv/ARqfI6OC44ipoOMNK1Aiu6+slbPYphwX
+ighSz9yYuG0EdWt7akfKR0R04Kuej4LXLWcxTR4l8XDzThYgPP0g+z0XQJrAkVhi
+SrzICeC3K1GPSiUtNAxSTL+qWWgwvQyAPNoPV/OYmY+wUxUnKCZpEWPkL79lh6CM
+bJx/zlrOMzRumSzaOnKW9AOliviH4Rj89OmDifBEsQ0CewdHN9ly6g4ZFJJGYXJ5
+HTb5jdButTC3tDfvH8Z7dtXKdC4iqJCIxj698Xn8UjVefZQ2nbv5eXcZLfHtvbNB
+TTv1vvBV4G7aiHKYRSj7HmxhLBZC8Y/nmFAemOoOYDpR5eUmPmSbFayoLfRsFXmC
+HLs7cw==
+=6hRW
+-----END PGP PUBLIC KEY BLOCK-----
--- a/28
+++ b/28
@ -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-----
--- a/29
+++ b/29
@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBFvrElgBEACjNft3anFHNzwHW6dzxGinWEzFin3xBUjhre7e23DgDRIceDte
+POqXGnIN5yGGH4VZrEGHfjTPoCcrRSpM75ryPLa3Pi0UHXRso/OkO2ta+VaQRlwU
+2WAYqd3g/eck+x7MZHuKKyfyxDSUywuJumWhIqeJLyG/J9e1riHwaxYwtLDvHCAt
+K4osoJ6GZDx95Rr4El/N5CtZBlIzRQUJMo695MIxeKA6RmlQVp8mGPQm20Hveo0k
+BsLYFJxTW4D+KnwpQr2mJLsEQnCgKcr8TF5hDowz8+o3wdUrfteiVfkdX64kXJm8
+5jaR/K0ubnv96iTxoeh2Wf2jNAn3EjKhPzEeYFI2gCm2tzwUEzSuOjtrx7FqDp7/
+iJRANmKQJ9KzhCT5JLkeS5do8d196xiI79Zlx8ISQRvCNuu1Or7idwvIgHy/+BCy
+PUARv430YvXU4d01FVKTlNrbRsq91SVojek4UXkAk9oh4d3Y/AQF1DLs4nK1vBuk
+wWIKwcfVA/RidSqXofx6pahTPvguTkAARhMEJPLtbQBzD5kqkdgdP/6s7ziTwGkG
+O8iF0TvkCwMXWXHl1B/m6b3h/wWOIFNfAZ0FxZmmD5UhytjVjhdI7jiyZf6JjNup
+VCVx1eqMGZfm3jkZqzWOB9wrVrb6rtI25ZuoRQJ/idnXkxZmq4m1MCZbCQARAQAB
+tDVGZWRvcmEgKGlvdCAyMDE5KSA8ZmVkb3JhLWlvdC0yMDE5QGZlZG9yYXByb2pl
+Y3Qub3JnPokCPgQTAQIAKAUCW+sSWAIbDwUJEw5BKAYLCQgHAwIGFQgCCQoLBBYC
+AwECHgECF4AACgkQe7kHItu9z3xs8Q/9HqL76vo5xZjl78USwgX7t2f8Aa6sqD6O
+IV4V9KPCaNeqP8OF6LqYFxkv3GX3FMHGPHVKOBLQ6LvuGozcnnpZ3ypq6ChAy2L4
+W7ytFggpluArxSN5jmHoOXO51wPDPCSjd4rRi1+XnMDiA3VIk0vTcGHUK13Jgvzu
+UrIbFYhVwwCn8Rt0GvCWVLyvKRbykN3xgFmromREKdDCUymYS/u4hXw5xQt2AE9I
+gX9puLlGH5AdbJumMipcaI9erH/KVoBvtAHA5ozkL0PDocRaWA/W+i8rXEeI8TJB
+A7Q/Xb/L12aIOCzeyEKGP911iR3/99UGMgfswKvF4WT4KdAV2VZoPizu0Am2MUYh
+oexdnHY6GtU1UKcWt2hW7HmGBCZVdVpUF3W/gebe+ahLPT9UhqNTin2vw7MxMKy2
+uWPZri76R165F3TP434dZLNfkNa1rdtQrRaD1Be9/hAQthYWKoCFowbMLAr1Bgzk
+Us97arxBTzqkr9GTCy5CX+nObIbwkrFYugRfA4bSzNFSpCo71cudqNwKJEw65lF9
+0+T5ma7lM6ZwijH1A9pYeGQS0eUOrV/0VTsxXQOyS6Mcfper+dkOpypZdSnJGzid
+9HPUSUdjI94wtRYInrcD09v5OnJcoxUDVVjVhH4FIqKVYstucn/LB67nnn+55uTO
+Kdm729ex0UI=
+=vzvx
+-----END PGP PUBLIC KEY BLOCK-----
--- a/8
+++ b/8
@ -58,3 +58,11 @@ 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-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
--- a/fedora-cisco-openh264.repo
+++ b/fedora-cisco-openh264.repo
@ -8,7 +8,7 @@ metadata_expire=14d
 repo_gpgcheck=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
+skip_if_unavailable=True

 [fedora-cisco-openh264-debuginfo]
 name=Fedora $releasever openh264 (From Cisco) - $basearch - Debug
@ -20,5 +20,5 @@ metadata_expire=28d
 repo_gpgcheck=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
+skip_if_unavailable=True

--- a/fedora-modular.repo
+++ b/fedora-modular.repo
@ -3,7 +3,7 @@ name=Fedora Modular $releasever - $basearch
 failovermethod=priority
 #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
--- a/fedora-rawhide-modular.repo
+++ b/fedora-rawhide-modular.repo
@ -24,7 +24,7 @@ name=Fedora - Modular Rawhide - Developmental packages for the next Fedora relea
 failovermethod=priority
 #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
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@ -24,7 +24,7 @@ name=Fedora - Rawhide - Developmental packages for the next Fedora release
 failovermethod=priority
 #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
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@ -1,13 +1,12 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        29
-Release:        0.7%{?_module_build:%{?dist}}
+Release:        6%{?_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
@ -62,6 +61,8 @@ Source47:       RPM-GPG-KEY-fedora-27-primary
 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
@ -69,6 +70,9 @@ Source102:      fedora-updates-testing-modular.repo
 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

@ -91,6 +95,14 @@ Obsoletes:      fedora-release-rawhide <= 22-0.3
 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

 %build
@ -123,6 +135,10 @@ 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
@ -144,8 +160,39 @@ 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 Aug 19 2019 Kevin Fenzi <kevin@scrye.com> - 29-6
+- Add Fedora 32 key
+
+* Tue Mar 19 2019 Sinny Kumari <skumari@redhat.com> - 29-5
+- Create fedora-repos-ostree sub-package
+
+* Wed Mar 13 2019 Mohan Boddu <mboddu@bhujji.com> - 29-4
+- Adding F31 archmap (BZ #1688460)
+
+* Mon Feb 18 2019 Mohan Boddu <mboddu@bhujji.com> - 29-3
+- Adding F31 key
+
+* Wed Nov 14 2018 Mohan Boddu <mboddu@redhat.com> - 29-2
+- Adding fedora-iot-2019 key
+
+* Sun Oct 14 2018 Mohan Boddu <mboddu@redhat.com> - 29-1
+- Setup for F29 Final
+
+* Thu Aug 23 2018 Stephen Gallagher <sgallagh@redhat.com> - 29-0.9
+- Don't pull in fedora-repos-rawhide
+
+* Tue Aug 14 2018 Mohan Boddu <mboddu@bhujji.com> 29-0.8
+- Disable rawhide, rawhide-modular
+- Enable fedora, update, updates-testing repo
+- Adding fedora 30 key
+- Enable modular repos by default
+
 * Wed Aug  8 2018 Peter Robinson <pbrobinson@fedoraproject.org> 29-0.7
 - Increment and build for source merge change

--- 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
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 #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
--- a/fedora.conf
+++ 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
--- a/fedora.repo
+++ b/fedora.repo
@ -3,8 +3,8 @@ name=Fedora $releasever - $basearch
 failovermethod=priority
 #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
-#metadata_expire=7d
+enabled=1
+metadata_expire=7d
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
Author	SHA1	Message	Date
Peter Robinson	9af02795b0	Fix the Source52 to be fedora 32 Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2019-08-19 18:50:25 +01:00
Kevin Fenzi	d7104fbdad	Add the f32 key to fedora 29 Signed-off-by: Kevin Fenzi <kevin@scrye.com>	2019-08-19 10:05:10 -07:00
Sinny Kumari	778c289d67	Create fedora-repos-ostree sub-package Useful for Silverblue users when they will upgrade their system from F29 to F30 Related- https://github.com/coreos/fedora-coreos-tracker/issues/143 https://github.com/coreos/fedora-coreos-config/pull/65 Signed-off-by: Sinny Kumari <sinny@redhat.com>	2019-03-19 08:26:18 +05:30
Mohan Boddu	805bf9b802	Adding F31 archmap Fixes #1688460 Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2019-03-13 15:02:35 -04:00
Mohan Boddu	f15cf13c08	Adding F31 key Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2019-02-18 14:02:51 -05:00
Mohan Boddu	9bcacb2058	Adding fedora-iot-2019 key Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2018-11-14 09:47:12 -05:00
Mohan Boddu	1c1bcccca9	Setup for F29 Final Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2018-10-14 12:41:40 -04:00
Peter Robinson	b41d7f33e0	Enable the skip if unavailable for the cisco-openh264 repo With the cisco-openh264 being a baseurl and not mirroed if the repo is unavailable all updates fail. We should enable users to get all the standard Fedora updates if for some reason this repo is not working which at times is out of the Fedora infra team's control. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>	2018-10-02 11:21:28 +01:00
Stephen Gallagher	46899a9db8	Don't pull in fedora-repos-rawhide Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>	2018-08-23 10:08:39 -04:00
Mohan Boddu	e0ac73a3c1	Branching F29 from rawhide Signed-off-by: Mohan Boddu <mboddu@bhujji.com>	2018-08-14 14:35:02 -04:00