diff --git a/SOURCES/CentOS-Stream-Kmods-Rebuild.repo b/SOURCES/CentOS-Stream-Kmods-Rebuild.repo deleted file mode 100644 index 34d89a9..0000000 --- a/SOURCES/CentOS-Stream-Kmods-Rebuild.repo +++ /dev/null @@ -1,20 +0,0 @@ -[centos-kmods-rebuild] -name=CentOS Stream $releasever - Kmods - Rebuild -mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=kmods-packages-rebuild -#baseurl=http://mirror.centos.org/$contentdir/$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 - Rebuild - Source -baseurl=https://vault.centos.org/$contentdir/$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 index e9d4dad..11a7768 100644 --- a/SOURCES/CentOS-Stream-Kmods.repo +++ b/SOURCES/CentOS-Stream-Kmods.repo @@ -18,3 +18,24 @@ baseurl=https://vault.centos.org/$contentdir/$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 +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=kmods-packages-rebuild +#baseurl=http://mirror.centos.org/$contentdir/$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 +baseurl=https://vault.centos.org/$contentdir/$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 390c925..c4ababd 100644 --- a/SPECS/centos-release-kmods.spec +++ b/SPECS/centos-release-kmods.spec @@ -1,32 +1,22 @@ 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://wiki.centos.org/SpecialInterestGroup/Kmods +URL: https://sigs.centos.org/kmods Source0: RPM-GPG-KEY-CentOS-SIG-Kmods Source1: CentOS-Stream-Kmods.repo -Source2: CentOS-Stream-Kmods-Rebuild.repo BuildArch: noarch Requires: centos-stream-release +Provides: centos-release-kmods-rebuild = %{version}-%{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 +27,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 @@ -47,13 +37,23 @@ 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 +%ghost %{_sysconfdir}/yum.repos.d/CentOS-Stream-Kmods-Rebuild.repo -%files rebuild -%config(noreplace) %{_sysconfdir}/yum.repos.d/CentOS-Stream-Kmods-Rebuild.repo +%triggerin -- centos-release-kmods-rebuild +REPO=/etc/yum.repos.d/CentOS-Stream-Kmods.repo +if [ -f "${REPO}" ] +then + sed -i '/^\[centos-kmods-rebuild\]$/,/^enabled=.$/s/^enabled=0$/enabled=1/' $REPO +fi %changelog +* Thu Jan 20 2022 Peter Georg - 2-2 +- Add *-source repos +- Use a single config file for all repos +- Disable centos-kmods-rebuild by default + * Thu Aug 12 2021 Peter Georg - 2-1 - Add *-testing repos