From 72a06747675c5e465edc64b663f81af1374ad1c2 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Aug 04 2023 11:45:35 +0000 Subject: reef --- diff --git a/README.md b/README.md index dc3e4b3..ab7ed9c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -centos-release-ceph-quincy provides the YUM repository file for packages of the -CentOS Storage SIG that are used with Ceph Pacific +centos-release-ceph-reef provides the YUM repository file for packages of the +CentOS Storage SIG that are used with Ceph Reef This package needs to be built against the following targets so that the packages land at the right tag for inclusion in CentOS Extras: @@ -8,9 +8,21 @@ packages land at the right tag for inclusion in CentOS Extras: Building the package can be done like this: - $ rpmbuild -bs \ +1. $ rpmbuild -bs \ --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \ - --define "dist .el8.centos" \ - SPECS/centos-release-ceph-quincy.spec + --define "dist .el8s.centos" \ + SPECS/centos-release-ceph-reef.spec + +2. commit and push SPECS/centos-release-ceph.spec + $ git add SPECS/ceph.spec + $ git push origin c8s-sig-storage-reef + +3. retrieve the commit for step 3: + $ git log|head -n 1 +commit 29f19456be12986e86392652331e3a56ff0a88a0 + +4. build + $ cbs build extras8s-extras-common-el8s git+https://git.centos.org/rpms/centos-release-ceph.git#29f19456be12986e86392652331e3a56ff0a88a0 + + - Ask hughesjr in #centos-devel @FreeNode IRC to build diff --git a/SOURCES/CentOS-Ceph-Quincy.repo b/SOURCES/CentOS-Ceph-Quincy.repo deleted file mode 100644 index 43586a3..0000000 --- a/SOURCES/CentOS-Ceph-Quincy.repo +++ /dev/null @@ -1,26 +0,0 @@ -# CentOS-Ceph-Quincy.repo -# -# Please see https://wiki.centos.org/SpecialInterestGroup/Storage for more -# information - -[centos-ceph-quincy] -name=CentOS-$stream - Ceph Quincy -mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=storage-ceph-quincy -#baseurl=http://mirror.centos.org/$contentdir/$stream/storage/$basearch/ceph-quincy/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - -[centos-ceph-quincy-test] -name=CentOS-$stream - Ceph Quincy Testing -baseurl=https://buildlogs.centos.org/centos/$stream/storage/$basearch/ceph-quincy/ -gpgcheck=0 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage - -[centos-ceph-quincy-source] -name=CentOS-$stream - Ceph Quincy Source -baseurl=http://vault.centos.org/$contentdir/$stream/storage/Source/ceph-quincy/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/SOURCES/CentOS-Ceph-Reef.repo b/SOURCES/CentOS-Ceph-Reef.repo new file mode 100644 index 0000000..eda6dcb --- /dev/null +++ b/SOURCES/CentOS-Ceph-Reef.repo @@ -0,0 +1,26 @@ +# CentOS-Ceph-Reef.repo +# +# Please see https://wiki.centos.org/SpecialInterestGroup/Storage for more +# information + +[centos-ceph-reef] +name=CentOS-$stream - Ceph Reef +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=storage-ceph-reef +#baseurl=http://mirror.centos.org/$contentdir/$stream/storage/$basearch/ceph-reef/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage + +[centos-ceph-reef-test] +name=CentOS-$stream - Ceph Reef Testing +baseurl=https://buildlogs.centos.org/centos/$stream/storage/$basearch/ceph-reef/ +gpgcheck=0 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage + +[centos-ceph-reef-source] +name=CentOS-$stream - Ceph Reef Source +baseurl=http://vault.centos.org/$contentdir/$stream/storage/Source/ceph-reef/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage diff --git a/SPECS/centos-release-ceph-quincy.spec b/SPECS/centos-release-ceph-quincy.spec deleted file mode 100644 index 9bb6e2a..0000000 --- a/SPECS/centos-release-ceph-quincy.spec +++ /dev/null @@ -1,55 +0,0 @@ -Summary: Ceph Quincy packages from the CentOS Storage SIG repository -Name: centos-release-ceph-quincy -Version: 1.0 -Release: 3%{?dist} -License: GPLv2 -URL: http://wiki.centos.org/SpecialInterestGroup/Storage -Source0: CentOS-Ceph-Quincy.repo -%if 0%{?centos} >= 8 -BuildRequires: systemd -%endif -BuildArch: noarch - -%if 0%{?centos} >= 8 -# $contentdir for altarch support was added with CentOS-8.5 -Requires: centos-release >= 8-0.1905.el8 -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd -%endif -# This provides the public key to verify the RPMs -Requires: centos-release-storage-common - -Provides: centos-release-ceph = 17 - -%description -yum configuration for Ceph Quincy packages from the CentOS Storage SIG. - -%install -install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-Quincy.repo -%if 0%{?centos} < 7 -sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-Quincy.repo -%endif - -%if 0%{?centos} >= 7 -%post -%systemd_post - -%preun -%systemd_preun - -%postun -%systemd_postun -%endif - -%files -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Ceph-Quincy.repo - -%changelog -* Mon Jun 21 2021 Kaleb S. KEITHLEY - 1.0-2 -- c8stream - -* Thu May 14 2020 Kaleb S. KEITHLEY - 1.0-1 -- initial checkin in git.centos.org ex github - diff --git a/SPECS/centos-release-ceph-reef.spec b/SPECS/centos-release-ceph-reef.spec new file mode 100644 index 0000000..ffbbc2c --- /dev/null +++ b/SPECS/centos-release-ceph-reef.spec @@ -0,0 +1,52 @@ +Summary: Ceph Reef packages from the CentOS Storage SIG repository +Name: centos-release-ceph-reef +Version: 1.0 +Release: 3%{?dist} +License: GPLv2 +URL: http://wiki.centos.org/SpecialInterestGroup/Storage +Source0: CentOS-Ceph-Reef.repo +%if 0%{?centos} >= 8 +BuildRequires: systemd +%endif +BuildArch: noarch + +%if 0%{?centos} >= 8 +# $contentdir for altarch support was added with CentOS-8.5 +Requires: centos-release >= 8-0.1905.el8 +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%endif +# This provides the public key to verify the RPMs +Requires: centos-release-storage-common + +Provides: centos-release-ceph = 18 + +%description +yum configuration for Ceph Reef packages from the CentOS Storage SIG. + +%install +install -D -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-Reef.repo +%if 0%{?centos} < 7 +sed -i 's/i\$contentdir/centos/g' %{buildroot}%{_sysconfdir}/yum.repos.d/CentOS-Ceph-Reef.repo +%endif + +%if 0%{?centos} >= 7 +%post +%systemd_post + +%preun +%systemd_preun + +%postun +%systemd_postun +%endif + +%files +%defattr(-,root,root) +%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Ceph-Reef.repo + +%changelog +* Fri Aug 4 2023 Kaleb S. KEITHLEY - 1.0-1 +- reef +