fix gpg names to match sig reqs

This commit is contained in:
nazunalika 2022-04-05 18:03:31 -07:00
parent 42d36c73a2
commit e6a27b7b5d
Signed by: label
GPG Key ID: 6735C0E1BD65D048
15 changed files with 37 additions and 36 deletions

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=1 enabled=1
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[appstream-debug] [appstream-debug]
name=Rocky Linux $releasever - AppStream - Debug name=Rocky Linux $releasever - AppStream - Debug
@ -23,7 +23,7 @@ name=Rocky Linux $releasever - AppStream - Debug
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[appstream-source] [appstream-source]
name=Rocky Linux $releasever - AppStream - Source name=Rocky Linux $releasever - AppStream - Source
@ -31,4 +31,4 @@ name=Rocky Linux $releasever - AppStream - Source
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=1 enabled=1
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[baseos-debug] [baseos-debug]
name=Rocky Linux $releasever - BaseOS - Debug name=Rocky Linux $releasever - BaseOS - Debug
@ -23,7 +23,7 @@ name=Rocky Linux $releasever - BaseOS - Debug
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[baseos-source] [baseos-source]
name=Rocky Linux $releasever - BaseOS - Source name=Rocky Linux $releasever - BaseOS - Source
@ -31,4 +31,4 @@ name=Rocky Linux $releasever - BaseOS - Source
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[crb-debug] [crb-debug]
name=Rocky Linux $releasever - CRB - Debug name=Rocky Linux $releasever - CRB - Debug
@ -23,7 +23,7 @@ name=Rocky Linux $releasever - CRB - Debug
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/debug/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/debug/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[crb-source] [crb-source]
name=Rocky Linux $releasever - CRB - Source name=Rocky Linux $releasever - CRB - Source
@ -31,4 +31,4 @@ name=Rocky Linux $releasever - CRB - Source
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/source/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/source/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -8,4 +8,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Devel/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=1 enabled=1
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[extras-debug] [extras-debug]
name=Rocky Linux $releasever - Extras Debug name=Rocky Linux $releasever - Extras Debug
@ -23,7 +23,7 @@ name=Rocky Linux $releasever - Extras Debug
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/debug/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/debug/tree/
gpgcheck=1 gpgcheck=1
enabled=1 enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[extras-source] [extras-source]
name=Rocky Linux $releasever - Extras Source name=Rocky Linux $releasever - Extras Source
@ -31,4 +31,4 @@ name=Rocky Linux $releasever - Extras Source
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/
gpgcheck=1 gpgcheck=1
enabled=1 enabled=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basea
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[highavailability-debug] [highavailability-debug]
name=Rocky Linux $releasever - High Availability - Debug name=Rocky Linux $releasever - High Availability - Debug
@ -23,7 +23,7 @@ name=Rocky Linux $releasever - High Availability - Debug
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[highavailability-source] [highavailability-source]
name=Rocky Linux $releasever - High Availability - Source name=Rocky Linux $releasever - High Availability - Source
@ -31,4 +31,4 @@ name=Rocky Linux $releasever - High Availability - Source
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -20,7 +20,7 @@ name=Rocky Linux $releasever - LookAhead BaseOS
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/BaseOS/$basearch/os/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/BaseOS/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[lh-appstream] [lh-appstream]
name=Rocky Linux $releasever - LookAhead AppStream name=Rocky Linux $releasever - LookAhead AppStream
@ -28,7 +28,7 @@ name=Rocky Linux $releasever - LookAhead AppStream
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/AppStream/$basearch/os/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/AppStream/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[lh-crb] [lh-crb]
name=Rocky Linux $releasever - LookAhead CRB name=Rocky Linux $releasever - LookAhead CRB
@ -36,4 +36,4 @@ name=Rocky Linux $releasever - LookAhead CRB
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/CRB/$basearch/os/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/lh/CRB/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -10,7 +10,7 @@ baseurl=file:///media/Rocky/BaseOS
file:///media/cdrecorder/BaseOS file:///media/cdrecorder/BaseOS
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[media-appstream] [media-appstream]
name=Rocky Linux $releasever - Media - AppStream name=Rocky Linux $releasever - Media - AppStream
@ -19,4 +19,4 @@ baseurl=file:///media/Rocky/AppStream
file:///media/cdrecorder/AppStream file:///media/cdrecorder/AppStream
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,4 +15,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/nfv/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[plus-debug] [plus-debug]
name=Rocky Linux $releasever - Plus - Debug name=Rocky Linux $releasever - Plus - Debug
@ -23,7 +23,7 @@ name=Rocky Linux $releasever - Plus - Debug
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/debug/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/debug/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[plus-source] [plus-source]
name=Rocky Linux $releasever - Plus - Source name=Rocky Linux $releasever - Plus - Source
@ -31,4 +31,4 @@ name=Rocky Linux $releasever - Plus - Source
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/source/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/source/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[rt-debug] [rt-debug]
name=Rocky Linux $releasever - Realtime Debug name=Rocky Linux $releasever - Realtime Debug
@ -23,7 +23,7 @@ name=Rocky Linux $releasever - Realtime Debug
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[rt-source] [rt-source]
name=Rocky Linux $releasever - Realtime Source name=Rocky Linux $releasever - Realtime Source
@ -31,5 +31,5 @@ name=Rocky Linux $releasever - Realtime Source
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basea
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[resilient-storage-debug] [resilient-storage-debug]
name=Rocky Linux $releasever - Resilient Storage - Debug name=Rocky Linux $releasever - Resilient Storage - Debug
@ -23,7 +23,7 @@ name=Rocky Linux $releasever - Resilient Storage - Debug
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[resilient-storage-source] [resilient-storage-source]
name=Rocky Linux $releasever - Resilient Storage - Source name=Rocky Linux $releasever - Resilient Storage - Source
@ -31,4 +31,4 @@ name=Rocky Linux $releasever - Resilient Storage - Source
baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -15,7 +15,7 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
[sap-hana] [sap-hana]
name=Rocky Linux $releasever - SAP name=Rocky Linux $releasever - SAP
@ -24,4 +24,4 @@ baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/os/
gpgcheck=1 gpgcheck=1
enabled=0 enabled=0
countme=1 countme=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9

View File

@ -16,7 +16,7 @@
%define distro_code Blue Onyx %define distro_code Blue Onyx
%define major 9 %define major 9
%define minor 0 %define minor 0
%define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.7} %define rocky_rel 1%{?rllh:.%{rllh}}%{!?rllh:.8}
%define rpm_license BSD-3-Clause %define rpm_license BSD-3-Clause
%define dist .el%{major} %define dist .el%{major}
@ -107,7 +107,7 @@ Provides: centos-release-eula = %{version}-%{release}
Requires: rocky-repos(%{major}) Requires: rocky-repos(%{major})
# GPG Keys (100-199) # GPG Keys (100-199)
Source101: RPM-GPG-KEY-rocky-%{major} Source101: RPM-GPG-KEY-Rocky-%{major}
Source102: RPM-GPG-KEY-rockytesting Source102: RPM-GPG-KEY-rockytesting
# Release Sources (200-499) # Release Sources (200-499)
@ -406,13 +406,14 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
%{_datadir}/pki/sb-certs/*.crt %{_datadir}/pki/sb-certs/*.crt
%changelog %changelog
* Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.7 * Tue Feb 08 2022 Louis Abel <label@rockylinux.org> - 9.0-1.8
- Backport current SB certs for now - Backport current SB certs for now
- Add logrotate timer and switcheroo - Add logrotate timer and switcheroo
- Add missing macros - Add missing macros
- Fix CPE values - Fix CPE values
- Remove /etc/centos-release - Remove /etc/centos-release
- Add redhat tags to os-release - Add redhat tags to os-release
- Fix GPG key names to be consistent with SIG requirements
* Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1 * Mon Jan 10 2022 Louis Abel <label@rockylinux.org> - 9.0-1.1
- Add LOGO to /etc/os-release - Add LOGO to /etc/os-release