From 7e41cef418ab8781dab118e81f811221dd83c226 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Aug 02 2019 17:06:13 +0000 Subject: Split repos and enable for release Signed-off-by: Johnny Hughes --- diff --git a/.gitignore b/.gitignore index 7d92609..83498ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ BUILD/ -BUILDROOT/ -RPMS/ +BUILDROOT/ +RPMS/ SRPMS/ SOURCES/*.xz SOURCES/*.gz diff --git a/SOURCES/CentOS-AppStream.repo b/SOURCES/CentOS-AppStream.repo new file mode 100644 index 0000000..e6a7e0c --- /dev/null +++ b/SOURCES/CentOS-AppStream.repo @@ -0,0 +1,20 @@ +# CentOS-AppStream.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[AppStream] +name=CentOS-$releasever - AppStream +mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$releasever/AppStream/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SOURCES/CentOS-Base.repo b/SOURCES/CentOS-Base.repo index c390ff7..0f8576d 100644 --- a/SOURCES/CentOS-Base.repo +++ b/SOURCES/CentOS-Base.repo @@ -15,24 +15,6 @@ name=CentOS-$releasever - Base mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=$infra #baseurl=http://mirror.centos.org/$contentdir/$releasever/BaseOS/$basearch/os/ gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - -#AppStream -[AppStream] -name=CentOS-$releasever - AppStream -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/AppStream/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - -#Devel -[Devel] -name=CentOS-$releasever - Devel -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=Devel&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/Devel/$basearch/os/ -gpgcheck=1 -enabled=0 +enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/SOURCES/CentOS-Devel.repo b/SOURCES/CentOS-Devel.repo new file mode 100644 index 0000000..b85475c --- /dev/null +++ b/SOURCES/CentOS-Devel.repo @@ -0,0 +1,20 @@ +# CentOS-Devel.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[Devel] +name=CentOS-$releasever - Devel +mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=Devel&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$releasever/Devel/$basearch/os/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SOURCES/CentOS-Extras.repo b/SOURCES/CentOS-Extras.repo index 80feed4..8112423 100644 --- a/SOURCES/CentOS-Extras.repo +++ b/SOURCES/CentOS-Extras.repo @@ -19,12 +19,3 @@ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial -#additional packages that extend functionality of existing packages -[centosplus] -name=CentOS-$releasever - Plus -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/centosplus/$basearch/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-centosplus.repo b/SOURCES/CentOS-centosplus.repo new file mode 100644 index 0000000..e9a4c01 --- /dev/null +++ b/SOURCES/CentOS-centosplus.repo @@ -0,0 +1,21 @@ +# CentOS-centosplus.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +#additional packages that extend functionality of existing packages +[centosplus] +name=CentOS-$releasever - Plus +mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$releasever/centosplus/$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec index 3f123a5..7ead8e8 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec @@ -27,7 +27,7 @@ Name: centos-release Version: %{upstream_rel} -Release: %{centos_rel}.0.5%{?dist} +Release: %{centos_rel}.0.6%{?dist} Summary: %{product_family} release file Group: System Environment/Base License: GPLv2 @@ -69,6 +69,9 @@ Source304: CentOS-fasttrack.repo Source305: CentOS-Media.repo Source306: CentOS-Sources.repo Source307: CentOS-Vault.repo +Source308: CentOS-AppStream.repo +Source309: CentOS-Devel.repo +Source310: CentOS-centosplus.repo %ifarch %{arm} %description -n %{pkg_name} @@ -140,6 +143,9 @@ install -m 644 %{SOURCE304} %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE305} %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE306} %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE307} %{buildroot}/etc/yum.repos.d +install -m 644 %{SOURCE308} %{buildroot}/etc/yum.repos.d +install -m 644 %{SOURCE309} %{buildroot}/etc/yum.repos.d +install -m 644 %{SOURCE310} %{buildroot}/etc/yum.repos.d mkdir -p -m 755 %{buildroot}/etc/dnf/vars echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra