From bd4c6e6aa4bee7e90435ec6a47a3477e1b8141ef Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 17 Jul 2023 15:03:51 +0300 Subject: [PATCH] - added rt, nfv, highavailabilit, resilientstorage repos - fix debug and sources url in repo files - added separate extra package for devel repo --- SOURCES/msvsphere-appstream.repo | 4 +-- SOURCES/msvsphere-baseos.repo | 4 +-- SOURCES/msvsphere-crb.repo | 4 +-- SOURCES/msvsphere-devel.repo | 30 +++++++++++++++++++ SOURCES/msvsphere-extras.repo | 4 +-- SOURCES/msvsphere-highavailability.repo | 30 +++++++++++++++++++ SOURCES/msvsphere-nfv.repo | 30 +++++++++++++++++++ SOURCES/msvsphere-resilientstorage.repo | 30 +++++++++++++++++++ SOURCES/msvsphere-rt.repo | 30 +++++++++++++++++++ SPECS/sphere-release.spec | 38 +++++++++++++++++++++++-- 10 files changed, 193 insertions(+), 11 deletions(-) create mode 100644 SOURCES/msvsphere-devel.repo create mode 100644 SOURCES/msvsphere-highavailability.repo create mode 100644 SOURCES/msvsphere-nfv.repo create mode 100644 SOURCES/msvsphere-resilientstorage.repo create mode 100644 SOURCES/msvsphere-rt.repo diff --git a/SOURCES/msvsphere-appstream.repo b/SOURCES/msvsphere-appstream.repo index 3d9cf72..cacb43c 100644 --- a/SOURCES/msvsphere-appstream.repo +++ b/SOURCES/msvsphere-appstream.repo @@ -12,7 +12,7 @@ enabled_metadata=1 [appstream-debug] name=MSVSphere $releasever - AppStream - Debug mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/appstream-debug -# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/AppStream/debug/$basearch/ +# baseurl=https://repo.inferitos.ru/vault/$releasever/AppStream/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 @@ -22,7 +22,7 @@ enabled_metadata=0 [appstream-source] name=MSVSphere $releasever - AppStream - Source mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/appstream-source -# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/AppStream/Source/ +# baseurl=https://repo.inferitos.ru/vault/$releasever/AppStream/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 diff --git a/SOURCES/msvsphere-baseos.repo b/SOURCES/msvsphere-baseos.repo index c5d8c06..60a38ea 100644 --- a/SOURCES/msvsphere-baseos.repo +++ b/SOURCES/msvsphere-baseos.repo @@ -12,7 +12,7 @@ enabled_metadata=1 [baseos-debug] name=MSVSphere $releasever - BaseOS - Debug mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/baseos-debug -# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/BaseOS/debug/$basearch/ +# baseurl=https://repo.inferitos.ru/vault/$releasever/BaseOS/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 @@ -22,7 +22,7 @@ enabled_metadata=0 [baseos-source] name=MSVSphere $releasever - BaseOS - Source mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/baseos-source -# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/BaseOS/Source/ +# baseurl=https://repo.inferitos.ru/vault/$releasever/BaseOS/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 diff --git a/SOURCES/msvsphere-crb.repo b/SOURCES/msvsphere-crb.repo index e6232ad..cce1a28 100644 --- a/SOURCES/msvsphere-crb.repo +++ b/SOURCES/msvsphere-crb.repo @@ -12,7 +12,7 @@ enabled_metadata=1 [crb-debug] name=MSVSphere $releasever - CRB - Debug mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/crb-debug -# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/CRB/debug/$basearch/ +# baseurl=https://repo.inferitos.ru/vault/$releasever/CRB/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 @@ -22,7 +22,7 @@ enabled_metadata=0 [crb-source] name=MSVSphere $releasever - CRB - Source mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/crb-source -# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/CRB/Source/ +# baseurl=https://repo.inferitos.ru/vault/$releasever/CRB/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 diff --git a/SOURCES/msvsphere-devel.repo b/SOURCES/msvsphere-devel.repo new file mode 100644 index 0000000..fa1f6de --- /dev/null +++ b/SOURCES/msvsphere-devel.repo @@ -0,0 +1,30 @@ +[devel] +name=MSVSphere $releasever - Devel +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/devel +# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/Devel/$basearch/os/ +enabled=1 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=1 + +[devel-debug] +name=MSVSphere $releasever - Devel - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/devel-debug +# baseurl=https://repo.inferitos.ru/vault/$releasever/Devel/debug/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 + +[devel-source] +name=MSVSphere $releasever - Devel - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/devel-source +# baseurl=https://repo.inferitos.ru/vault/$releasever/Devel/source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 diff --git a/SOURCES/msvsphere-extras.repo b/SOURCES/msvsphere-extras.repo index 853f47e..0ca432d 100644 --- a/SOURCES/msvsphere-extras.repo +++ b/SOURCES/msvsphere-extras.repo @@ -12,7 +12,7 @@ enabled_metadata=1 [extras-debug] name=MSVSphere $releasever - Extras - Debug mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/extras-debug -# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/Extras/debug/$basearch/ +# baseurl=https://repo.inferitos.ru/vault/$releasever/Extras/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 @@ -22,7 +22,7 @@ enabled_metadata=0 [extras-source] name=MSVSphere $releasever - Extras - Source mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/extras-source -# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/Extras/Source/ +# baseurl=https://repo.inferitos.ru/vault/$releasever/Extras/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 diff --git a/SOURCES/msvsphere-highavailability.repo b/SOURCES/msvsphere-highavailability.repo new file mode 100644 index 0000000..c5267d2 --- /dev/null +++ b/SOURCES/msvsphere-highavailability.repo @@ -0,0 +1,30 @@ +[highavailability] +name=MSVSphere $releasever - HighAvailability +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/highavailability +# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/HighAvailability/$basearch/os/ +enabled=1 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=1 + +[highavailability-debug] +name=MSVSphere $releasever - HighAvailability - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/highavailability-debug +# baseurl=https://repo.inferitos.ru/vault/$releasever/HighAvailability/debug/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 + +[highavailability-source] +name=MSVSphere $releasever - HighAvailability - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/highavailability-source +# baseurl=https://repo.inferitos.ru/vault/$releasever/HighAvailability/Source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 diff --git a/SOURCES/msvsphere-nfv.repo b/SOURCES/msvsphere-nfv.repo new file mode 100644 index 0000000..99c9eee --- /dev/null +++ b/SOURCES/msvsphere-nfv.repo @@ -0,0 +1,30 @@ +[nfv] +name=MSVSphere $releasever - NFV +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/nfv +# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/NFV/$basearch/os/ +enabled=1 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=1 + +[nfv-debug] +name=MSVSphere $releasever - NFV - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/nfv-debug +# baseurl=https://repo.inferitos.ru/vault/$releasever/NFV/debug/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 + +[nfv-source] +name=MSVSphere $releasever - NFV - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/nfv-source +# baseurl=https://repo.inferitos.ru/vault/$releasever/NFV/Source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 diff --git a/SOURCES/msvsphere-resilientstorage.repo b/SOURCES/msvsphere-resilientstorage.repo new file mode 100644 index 0000000..11e6d88 --- /dev/null +++ b/SOURCES/msvsphere-resilientstorage.repo @@ -0,0 +1,30 @@ +[resilientstorage] +name=MSVSphere $releasever - ResilientStorage +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/resilientstorage +# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/ResilientStorage/$basearch/os/ +enabled=1 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=1 + +[resilientstorage-debug] +name=MSVSphere $releasever - ResilientStorage - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/resilientstorage-debug +# baseurl=https://repo.inferitos.ru/vault/$releasever/ResilientStorage/debug/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 + +[resilientstorage-source] +name=MSVSphere $releasever - ResilientStorage - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/resilientstorage-source +# baseurl=https://repo.inferitos.ru/vault/$releasever/ResilientStorage/Source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 diff --git a/SOURCES/msvsphere-rt.repo b/SOURCES/msvsphere-rt.repo new file mode 100644 index 0000000..d2f4cf6 --- /dev/null +++ b/SOURCES/msvsphere-rt.repo @@ -0,0 +1,30 @@ +[rt] +name=MSVSphere $releasever - RT +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/rt +# baseurl=https://repo.inferitos.ru/msvsphere/$releasever/RT/$basearch/os/ +enabled=1 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=1 + +[rt-debug] +name=MSVSphere $releasever - RT - Debug +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/rt-debug +# baseurl=https://repo.inferitos.ru/vault/$releasever/RT/debug/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 + +[rt-source] +name=MSVSphere $releasever - RT - Source +mirrorlist=https://mirrors.inferitos.ru/mirrorlist/$releasever/rt-source +# baseurl=https://repo.inferitos.ru/vault/$releasever/RT/Source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MSVSphere-9 +metadata_expire=86400 +enabled_metadata=0 diff --git a/SPECS/sphere-release.spec b/SPECS/sphere-release.spec index e9df727..cf7eb8f 100644 --- a/SPECS/sphere-release.spec +++ b/SPECS/sphere-release.spec @@ -5,7 +5,7 @@ Name: sphere-release Version: %{major}.%{minor} -Release: 1.1%{?dist} +Release: 1.2%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://msvsphere.ru @@ -54,6 +54,11 @@ Source500: msvsphere-baseos.repo Source501: msvsphere-appstream.repo Source502: msvsphere-crb.repo Source503: msvsphere-extras.repo +Source504: msvsphere-devel.repo +Source505: msvsphere-rt.repo +Source506: msvsphere-nfv.repo +Source507: msvsphere-highavailability.repo +Source508: msvsphere-resilientstorage.repo %description %{distro} release files. @@ -78,6 +83,16 @@ Requires: sphere-gpg-keys = %{version}-%{release} This package provides the package repository files for %{distro}. +%package -n sphere-repos-extra +Summary: %{distro} extra package repositories +Requires: sphere-release = %{version}-%{release} +Requires: sphere-gpg-keys = %{version}-%{release} + +%description -n sphere-repos-extra +This package provides extra package repository files for %{distro}, +like Devel. + + %package -n sphere-gpg-keys Summary: %{distro} RPM keys @@ -86,7 +101,7 @@ This package provides the RPM signature keys for %{distro}. %install -mkdir ./docs +mkdir -p ./docs cp %{SOURCE200} ./docs # create /etc/sphere-release, /etc/system-release and /etc/redhat-release files @@ -195,6 +210,11 @@ install -p -m 0644 %{SOURCE500} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE501} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE502} %{buildroot}%{_sysconfdir}/yum.repos.d/ install -p -m 0644 %{SOURCE503} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE504} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE505} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE506} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE507} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE508} %{buildroot}%{_sysconfdir}/yum.repos.d/ # copy GPG keys install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg @@ -232,14 +252,26 @@ install -p -m 0644 %{SOURCE100} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-appstream.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-crb.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-extras.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-rt.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-nfv.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-highavailability.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-resilientstorage.repo %config(noreplace) %{_sysconfdir}/dnf/vars/stream +%files -n sphere-repos-extra +%config(noreplace) %{_sysconfdir}/yum.repos.d/msvsphere-devel.repo + %files -n sphere-gpg-keys %{_sysconfdir}/pki/rpm-gpg %changelog -* Wed Jul 6 2023 Sergey Cherevko - 9.2-1.1 +* Mon Jul 17 2023 Arkady L. Shane - 9.2-1.2 +- added rt, nfv, highavailabilit, resilientstorage repos +- fix debug and sources url in repo files +- added separate extra package for devel repo + +* Thu Jul 6 2023 Sergey Cherevko - 9.2-1.1 - Enable CRB by default (INF-387) * Thu May 25 2023 Sergey Cherevko - 9.2-1.0