From 20a0f7a0b36c29da94e3fe5eeaac81874eb7e102 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Tue, 19 Oct 2021 20:10:35 -0700 Subject: [PATCH] Consolidate debug and source repos --- SOURCES/Rocky-AppStream.repo | 16 ++++++++ SOURCES/Rocky-BaseOS.repo | 16 ++++++++ SOURCES/Rocky-CRB.repo | 18 ++++++++- SOURCES/Rocky-Debuginfo.repo | 43 --------------------- SOURCES/Rocky-Extras.repo | 16 ++++++++ SOURCES/Rocky-HighAvailability.repo | 18 ++++++++- SOURCES/Rocky-Plus.repo | 16 ++++++++ SOURCES/Rocky-RT.repo | 17 +++++++++ SOURCES/Rocky-ResilientStorage.repo | 16 ++++++++ SOURCES/Rocky-SAP.repo | 25 +++++++++++++ SOURCES/Rocky-Sources.repo | 58 ----------------------------- SPECS/rocky-release.spec | 16 ++++---- 12 files changed, 164 insertions(+), 111 deletions(-) delete mode 100644 SOURCES/Rocky-Debuginfo.repo create mode 100644 SOURCES/Rocky-SAP.repo delete mode 100644 SOURCES/Rocky-Sources.repo diff --git a/SOURCES/Rocky-AppStream.repo b/SOURCES/Rocky-AppStream.repo index c6b457e..dff9d7f 100644 --- a/SOURCES/Rocky-AppStream.repo +++ b/SOURCES/Rocky-AppStream.repo @@ -15,3 +15,19 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStre gpgcheck=1 enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[appstream-debug] +name=Rocky Linux $releasever - AppStream - Debug +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-debug +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[appstream-source] +name=Rocky Linux $releasever - AppStream - Source +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-$releasever-source +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-BaseOS.repo b/SOURCES/Rocky-BaseOS.repo index b3afce4..26f5ff9 100644 --- a/SOURCES/Rocky-BaseOS.repo +++ b/SOURCES/Rocky-BaseOS.repo @@ -15,3 +15,19 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS- gpgcheck=1 enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[baseos-debug] +name=Rocky Linux $releasever - BaseOS - Debug +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-debug +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[baseos-source] +name=Rocky Linux $releasever - BaseOS - Source +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$releasever-source +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-CRB.repo b/SOURCES/Rocky-CRB.repo index 819761d..1a09267 100644 --- a/SOURCES/Rocky-CRB.repo +++ b/SOURCES/Rocky-CRB.repo @@ -10,8 +10,24 @@ [crb] name=Rocky Linux $releasever - CRB -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=crb-$releasever +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/os/ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[crb-debug] +name=Rocky Linux $releasever - CRB - Debug +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=CRB-$releasever-debug +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/$basearch/debug/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[crb-source] +name=Rocky Linux $releasever - CRB - Source +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=CRB-$releasever-source +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/CRB/source/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-Debuginfo.repo b/SOURCES/Rocky-Debuginfo.repo deleted file mode 100644 index 4c43dae..0000000 --- a/SOURCES/Rocky-Debuginfo.repo +++ /dev/null @@ -1,43 +0,0 @@ -# Rocky-Debuginfo.repo -# - -[baseos-debug] -name=Rocky Linux $releasever - BaseOS - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever-debug -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/debug/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -[appstream-debug] -name=Rocky Linux $releasever - AppStream - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever-debug -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/debug/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -[ha-debug] -name=Rocky Linux $releasever - High Availability - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-debug -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -[powertools-debug] -name=Rocky Linux $releasever - PowerTools - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=PowerTools-$releasever-debug -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/$basearch/debug/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -[resilient-storage-debug] -name=Rocky Linux $releasever - Resilient Storage - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-debug -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - diff --git a/SOURCES/Rocky-Extras.repo b/SOURCES/Rocky-Extras.repo index 6614774..7b9bce3 100644 --- a/SOURCES/Rocky-Extras.repo +++ b/SOURCES/Rocky-Extras.repo @@ -15,3 +15,19 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras- gpgcheck=1 enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[extras-debug] +name=Rocky Linux $releasever - Extras Debug +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-debug +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/$basearch/debug/tree/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[extras-source] +name=Rocky Linux $releasever - Extras Source +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=extras-$releasever-source +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-HighAvailability.repo b/SOURCES/Rocky-HighAvailability.repo index 54f1a69..72e376a 100644 --- a/SOURCES/Rocky-HighAvailability.repo +++ b/SOURCES/Rocky-HighAvailability.repo @@ -8,10 +8,26 @@ # If the mirrorlist does not work for you, you can try the commented out # baseurl line instead. -[ha] +[highavailability] name=Rocky Linux $releasever - HighAvailability mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever #baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/os/ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[highavailability-debug] +name=Rocky Linux $releasever - High Availability - Debug +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=HighAvailability-$releasever-debug +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/$basearch/debug/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[highavailability-source] +name=Rocky Linux $releasever - High Availability - Source +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvailability-$releasever-source +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-Plus.repo b/SOURCES/Rocky-Plus.repo index 40b57d3..4a97260 100644 --- a/SOURCES/Rocky-Plus.repo +++ b/SOURCES/Rocky-Plus.repo @@ -15,3 +15,19 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockypl gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[plus-debug] +name=Rocky Linux $releasever - Plus - Debug +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=rockyplus-$releasever-debug +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/$basearch/debug/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[plus-source] +name=Rocky Linux $releasever - Plus - Source +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=rockyplus-$releasever-source +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/plus/source/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-RT.repo b/SOURCES/Rocky-RT.repo index fcb7f6f..44e3ee6 100644 --- a/SOURCES/Rocky-RT.repo +++ b/SOURCES/Rocky-RT.repo @@ -15,3 +15,20 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$rel gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[rt-debug] +name=Rocky Linux $releasever - Realtime Debug +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-debug +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/$basearch/debug/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[rt-source] +name=Rocky Linux $releasever - Realtime Source +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=RT-$releasever-source +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/RT/source/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + diff --git a/SOURCES/Rocky-ResilientStorage.repo b/SOURCES/Rocky-ResilientStorage.repo index ed0fe50..c39d378 100644 --- a/SOURCES/Rocky-ResilientStorage.repo +++ b/SOURCES/Rocky-ResilientStorage.repo @@ -15,3 +15,19 @@ mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=Resilie gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[resilient-storage-debug] +name=Rocky Linux $releasever - Resilient Storage - Debug +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=ResilientStorage-$releasever-debug +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/$basearch/debug/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[resilient-storage-source] +name=Rocky Linux $releasever - Resilient Storage - Source +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientStorage-$releasever-source +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-SAP.repo b/SOURCES/Rocky-SAP.repo new file mode 100644 index 0000000..f717a3f --- /dev/null +++ b/SOURCES/Rocky-SAP.repo @@ -0,0 +1,25 @@ +# Rocky-SAP.repo +# +# The mirrorlist system uses the connecting IP address of the client and the +# update status of each mirror to pick current mirrors that are geographically +# close to the client. You should use this for Rocky updates unless you are +# manually picking other mirrors. +# +# If the mirrorlist does not work for you, you can try the commented out +# baseurl line instead. + +[sap] +name=Rocky Linux $releasever - SAP +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAP-$releasever +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAP/$basearch/os/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 + +[sap-hana] +name=Rocky Linux $releasever - SAP +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=SAPHANA-$releasever +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/SAPHANA/$basearch/os/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 diff --git a/SOURCES/Rocky-Sources.repo b/SOURCES/Rocky-Sources.repo deleted file mode 100644 index 89ca260..0000000 --- a/SOURCES/Rocky-Sources.repo +++ /dev/null @@ -1,58 +0,0 @@ -# Rocky-Sources.repo - -[baseos-source] -name=Rocky Linux $releasever - BaseOS - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=BaseOS-$releasever-source -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/source/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -[appstream-source] -name=Rocky Linux $releasever - AppStream - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=AppStream-$releasever-source -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/source/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -#[extras-source] -#name=Rocky Linux $releasever - Extras - Source -#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=extras-$releasever-source -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/extras/source/tree/ -#gpgcheck=1 -#enabled=0 -#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -#[plus-source] -#name=Rocky Linux $releasever - Plus - Source -#mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=plus-$releasever-source -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/Plus/source/tree/ -#gpgcheck=1 -#enabled=0 -#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -[ha-source] -name=Rocky Linux $releasever - High Availability - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=HighAvailability-$releasever-source -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/HighAvailability/source/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -[powertools-source] -name=Rocky Linux $releasever - PowerTools - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=PowerTools-$releasever-source -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/PowerTools/source/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - -[resilient-storage-source] -name=Rocky Linux $releasever - Resilient Storage - Source -mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=source&repo=ResilientStorage-$releasever-source -#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/ResilientStorage/source/tree/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rocky-9 - diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index 09ce27a..9822f98 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -53,11 +53,11 @@ Provides: centos-release-eula # What are our requirements? Requires: rocky-repos(%{major}) -# GPG Keys +# GPG Keys (100-199) #Source101: RPM-GPG-KEY-rockyofficial Source102: RPM-GPG-KEY-rockytesting -# Release Sources +# Release Sources (200-399) Source200: EULA Source201: LICENSE Source202: Contributors @@ -68,7 +68,7 @@ Source302: 90-default-user.preset Source303: 99-default-disable.preset Source304: 50-redhat.conf -# Repo Sources +# Repo Sources (1200-1299) Source1200: Rocky-BaseOS.repo Source1201: Rocky-AppStream.repo Source1202: Rocky-CRB.repo @@ -79,16 +79,17 @@ Source1210: Rocky-HighAvailability.repo Source1211: Rocky-ResilientStorage.repo Source1212: Rocky-RT.repo Source1213: Rocky-NFV.repo +Source1214: Rocky-SAP.repo # Rocky Special Stuff Source1220: Rocky-Media.repo -Source1221: Rocky-Debuginfo.repo -Source1222: Rocky-Sources.repo Source1223: Rocky-Devel.repo Source1226: Rocky-Plus.repo + +# Add ons (1300-1399) Source1300: rocky.1.gz -# rocky secureboot certs placeholder +# rocky secureboot certs placeholder (1400-1499) %description %{distro_name} release files. @@ -251,9 +252,8 @@ install -p -m 0644 %{SOURCE1210} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE1211} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE1212} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE1213} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE1214} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE1220} %{buildroot}%{_sysconfdir}/yum.repos.d/ -install -p -m 0644 %{SOURCE1221} %{buildroot}%{_sysconfdir}/yum.repos.d/ -install -p -m 0644 %{SOURCE1222} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE1223} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE1226} %{buildroot}%{_sysconfdir}/yum.repos.d/