From 25f099bac0442618e1094b89337392333a6fe938 Mon Sep 17 00:00:00 2001 From: Peter Georg Date: Jan 20 2022 14:54:03 +0000 Subject: Use a single config file for all repos centos-kmods-rebuild is disabled by default. Has to be manually enabled. Also rename CentOS-Kmods.repo to centos-kmods.repo to use similar naming convention as CentOS Stream 9. --- diff --git a/SOURCES/CentOS-Stream-Kmods-Rebuild.repo b/SOURCES/CentOS-Stream-Kmods-Rebuild.repo deleted file mode 100644 index 1c952c8..0000000 --- a/SOURCES/CentOS-Stream-Kmods-Rebuild.repo +++ /dev/null @@ -1,21 +0,0 @@ -[centos-kmods-rebuild] -name=CentOS Stream $releasever - Kmods - Rebuild -metalink=https://mirrors.centos.org/metalink?repo=centos-kmods-sig-packages-rebuild-$stream&arch=$basearch&protocol=https,http -#baseurl=http://mirror.stream.centos.org/SIGs/$stream/kmods/$basearch/packages-rebuild -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods - -[centos-kmods-rebuild-testing] -name=CentOS Stream $releasever - Kmods - Rebuild - Testing -baseurl=https://buildlogs.centos.org/$contentdir/$stream/kmods/$basearch/packages-rebuild/ -gpgcheck=0 -enabled=0 - -[centos-kmods-rebuild-source] -name=CentOS Stream $releasever - Kmods -metalink=https://mirrors.centos.org/metalink?repo=centos-kmods-sig-packages-rebuild-source-$stream&arch=source&protocol=https,http -#baseurl=http://mirror.stream.centos.org/SIGs/$stream/kmods/source/packages-rebuild -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods diff --git a/SOURCES/CentOS-Stream-Kmods.repo b/SOURCES/CentOS-Stream-Kmods.repo deleted file mode 100644 index 345a8ff..0000000 --- a/SOURCES/CentOS-Stream-Kmods.repo +++ /dev/null @@ -1,21 +0,0 @@ -[centos-kmods] -name=CentOS Stream $releasever - Kmods -metalink=https://mirrors.centos.org/metalink?repo=centos-kmods-sig-packages-main-$stream&arch=$basearch&protocol=https,http -#baseurl=http://mirror.stream.centos.org/SIGs/$stream/kmods/$basearch/packages-main -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods - -[centos-kmods-testing] -name=CentOS Stream $releasever - Kmods - Testing -baseurl=https://buildlogs.centos.org/$contentdir/$stream/kmods/$basearch/packages-main/ -gpgcheck=0 -enabled=0 - -[centos-kmods-source] -name=CentOS Stream $releasever - Kmods -metalink=https://mirrors.centos.org/metalink?repo=centos-kmods-sig-packages-main-source-$stream&arch=source&protocol=https,http -#baseurl=http://mirror.stream.centos.org/SIGs/$stream/kmods/source/packages-main -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods diff --git a/SOURCES/centos-kmods.repo b/SOURCES/centos-kmods.repo new file mode 100644 index 0000000..3943a66 --- /dev/null +++ b/SOURCES/centos-kmods.repo @@ -0,0 +1,43 @@ +[centos-kmods] +name=CentOS Stream $releasever - Kmods +metalink=https://mirrors.centos.org/metalink?repo=centos-kmods-sig-packages-main-$stream&arch=$basearch&protocol=https,http +#baseurl=http://mirror.stream.centos.org/SIGs/$stream/kmods/$basearch/packages-main +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods + +[centos-kmods-testing] +name=CentOS Stream $releasever - Kmods - Testing +baseurl=https://buildlogs.centos.org/$contentdir/$stream/kmods/$basearch/packages-main/ +gpgcheck=0 +enabled=0 + +[centos-kmods-source] +name=CentOS Stream $releasever - Kmods - Source +metalink=https://mirrors.centos.org/metalink?repo=centos-kmods-sig-packages-main-source-$stream&arch=source&protocol=https,http +#baseurl=http://mirror.stream.centos.org/SIGs/$stream/kmods/source/packages-main +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods + +[centos-kmods-rebuild] +name=CentOS Stream $releasever - Kmods - Rebuild +metalink=https://mirrors.centos.org/metalink?repo=centos-kmods-sig-packages-rebuild-$stream&arch=$basearch&protocol=https,http +#baseurl=http://mirror.stream.centos.org/SIGs/$stream/kmods/$basearch/packages-rebuild +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods + +[centos-kmods-rebuild-testing] +name=CentOS Stream $releasever - Kmods - Rebuild - Testing +baseurl=https://buildlogs.centos.org/$contentdir/$stream/kmods/$basearch/packages-rebuild/ +gpgcheck=0 +enabled=0 + +[centos-kmods-rebuild-source] +name=CentOS Stream $releasever - Kmods - Rebuild - Source +metalink=https://mirrors.centos.org/metalink?repo=centos-kmods-sig-packages-rebuild-source-$stream&arch=source&protocol=https,http +#baseurl=http://mirror.stream.centos.org/SIGs/$stream/kmods/source/packages-rebuild +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods diff --git a/SPECS/centos-release-kmods.spec b/SPECS/centos-release-kmods.spec index 1cac576..ce9dcef 100644 --- a/SPECS/centos-release-kmods.spec +++ b/SPECS/centos-release-kmods.spec @@ -1,14 +1,13 @@ Name: centos-release-kmods Version: 2 -Release: 1%{?dist} -Summary: CentOS Kmods SIG repository configs +Release: 2%{?dist} +Summary: CentOS Kmods SIG package repositories License: GPLv2 URL: https://sigs.centos.org/kmods Source0: RPM-GPG-KEY-CentOS-SIG-Kmods -Source1: CentOS-Stream-Kmods.repo -Source2: CentOS-Stream-Kmods-Rebuild.repo +Source1: centos-kmods.repo BuildArch: noarch @@ -16,17 +15,7 @@ Requires: centos-stream-release %description -Configs for the CentOS Kmods SIG main package repository. - - -%package rebuild -Summary: CentOS Kmods SIG rebuild repo configs -Requires: centos-release-kmods = %{version}-%{release} - - -%description rebuild -Configs for the CentOS Kmods SIG rebuild repository. Packages in this repository -contain rebuilds of kernel modules provided by CentOS Stream. +This package provides the package repository files for CentOS Kmods SIG. %prep @@ -37,7 +26,7 @@ contain rebuilds of kernel modules provided by CentOS Stream. %install %{__install} -m 644 -D -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg %{SOURCE0} -%{__install} -m 644 -D -t %{buildroot}%{_sysconfdir}/yum.repos.d %{SOURCE1} %{SOURCE2} +%{__install} -m 644 -D -t %{buildroot}%{_sysconfdir}/yum.repos.d %{SOURCE1} %clean @@ -46,13 +35,13 @@ contain rebuilds of kernel modules provided by CentOS Stream. %files %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Kmods -%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Stream-Kmods.repo - - -%files rebuild -%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Stream-Kmods-Rebuild.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/centos-kmods.repo %changelog +* Thu Jan 20 2022 Peter Georg - 2-2 +- Use a single config file for all repos +- Disable centos-kmods-rebuild by default + * Fri Dec 24 2021 Peter Georg - 2-1 - Initial release