From 37b97d1181ea96c16e2e9b0546b55f0c131505b9 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Sep 19 2019 22:34:46 +0000 Subject: [PATCH 1/3] first build of centos-release-stream --- diff --git a/.centos-release-stream.metadata b/.centos-release-stream.metadata new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.centos-release-stream.metadata diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..83498ea --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +BUILD/ +BUILDROOT/ +RPMS/ +SRPMS/ +SOURCES/*.xz +SOURCES/*.gz +SOURCES/*.bz2 +SOURCES/*.rpm +SOURCES/*.orig +SOURCES/*.sign diff --git a/SOURCES/CentOS-Stream-AppStream.repo b/SOURCES/CentOS-Stream-AppStream.repo new file mode 100644 index 0000000..9098dbe --- /dev/null +++ b/SOURCES/CentOS-Stream-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. +# +# + +[Stream-AppStream] +name=CentOS-Stream - AppStream +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra +baseurl=http://mirror.centos.org/$contentdir/$stream/AppStream/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SOURCES/CentOS-Stream-Base.repo b/SOURCES/CentOS-Stream-Base.repo new file mode 100644 index 0000000..1ca676e --- /dev/null +++ b/SOURCES/CentOS-Stream-Base.repo @@ -0,0 +1,20 @@ +# CentOS-Base.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. +# +# + +[Stream-BaseOS] +name=CentOS-Stream - Base +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=$infra +baseurl=http://mirror.centos.org/$contentdir/$stream/BaseOS/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SOURCES/CentOS-Stream-Debuginfo.repo b/SOURCES/CentOS-Stream-Debuginfo.repo new file mode 100644 index 0000000..15c3b19 --- /dev/null +++ b/SOURCES/CentOS-Stream-Debuginfo.repo @@ -0,0 +1,21 @@ +# CentOS-Debug.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. +# + +# All debug packages from all the various CentOS-8 releases +# are merged into a single repo, split by BaseArch +# +# Note: packages in the debuginfo repo are currently not signed +# + +[Stream-base-debuginfo] +name=CentOS-Stream - Debuginfo +baseurl=http://debuginfo.centos.org/$stream/$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SOURCES/CentOS-Stream-Extras.repo b/SOURCES/CentOS-Stream-Extras.repo new file mode 100644 index 0000000..00e7652 --- /dev/null +++ b/SOURCES/CentOS-Stream-Extras.repo @@ -0,0 +1,21 @@ +# CentOS-Extras.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 may be useful +[Stream-extras] +name=CentOS-Stream - Extras +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra +baseurl=http://mirror.centos.org/$contentdir/$stream/extras/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SOURCES/CentOS-Stream-Media.repo b/SOURCES/CentOS-Stream-Media.repo new file mode 100644 index 0000000..de51dd2 --- /dev/null +++ b/SOURCES/CentOS-Stream-Media.repo @@ -0,0 +1,30 @@ +# CentOS-Media.repo +# +# This repo can be used with mounted DVD media, verify the mount point for +# CentOS-8. You can use this repo and yum to install items directly off the +# DVD ISO that we release. +# +# To use this repo, put in your DVD and use it with the other repos too: +# yum --enablerepo=c8-media [command] +# +# or for ONLY the media repo, do this: +# +# yum --disablerepo=\* --enablerepo=c8-media [command] + +[c8-Stream-media-BaseOS] +name=CentOS-Stream-BaseOS - Media +baseurl=file:///media/CentOS/BaseOS + file:///media/cdrom/BaseOS + file:///media/cdrecorder/BaseOS +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + +[c8-Stream-media-AppStream] +name=CentOS-Stream-AppStream - Media +baseurl=file:///media/CentOS/AppStream + file:///media/cdrom/AppStream + file:///media/cdrecorder/AppStream +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/SOURCES/CentOS-Stream-PowerTools.repo b/SOURCES/CentOS-Stream-PowerTools.repo new file mode 100644 index 0000000..8ab2d02 --- /dev/null +++ b/SOURCES/CentOS-Stream-PowerTools.repo @@ -0,0 +1,20 @@ +# CentOS-PowerTools.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. +# +# + +[Stream-PowerTools] +name=CentOS-Stream - PowerTools +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra +baseurl=http://mirror.centos.org/$contentdir/$stream/PowerTools/$basearch/os/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SOURCES/CentOS-Stream-Sources.repo b/SOURCES/CentOS-Stream-Sources.repo new file mode 100644 index 0000000..a0c005b --- /dev/null +++ b/SOURCES/CentOS-Stream-Sources.repo @@ -0,0 +1,43 @@ +# CentOS-Sources.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. +# +# + +[Stream-BaseOS-source] +name=CentOS-Stream - BaseOS Sources +baseurl=http://vault.centos.org/$contentdir/$stream/BaseOS/Source/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + +#AppStream +[Stream-AppStream-source] +name=CentOS-Stream - AppStream Sources +baseurl=http://vault.centos.org/$contentdir/$stream/AppStream/Source/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + +#additional packages that may be useful +[Stream-extras-source] +name=CentOS-Stream - Extras Sources +baseurl=http://vault.centos.org/$contentdir/$stream/extras/Source/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + +#additional packages that extend functionality of existing packages +[Stream-centosplus-source] +name=CentOS-Stream - Plus Sources +baseurl=http://vault.centos.org/$contentdir/$stream/centosplus/Source/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial + diff --git a/SOURCES/CentOS-Stream-Vault.repo b/SOURCES/CentOS-Stream-Vault.repo new file mode 100644 index 0000000..cf48d2a --- /dev/null +++ b/SOURCES/CentOS-Stream-Vault.repo @@ -0,0 +1,3 @@ +# CentOS Vault contains rpms from older releases in the CentOS-8 +# tree. + diff --git a/SOURCES/CentOS-Stream-centosplus.repo b/SOURCES/CentOS-Stream-centosplus.repo new file mode 100644 index 0000000..72f8de7 --- /dev/null +++ b/SOURCES/CentOS-Stream-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 +[Stream-centosplus] +name=CentOS-Stream - Plus +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra +baseurl=http://mirror.centos.org/$contentdir/$stream/centosplus/$basearch/os/ +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 new file mode 100644 index 0000000..1bc09aa --- /dev/null +++ b/SPECS/centos-release.spec @@ -0,0 +1,82 @@ +%define debug_package %{nil} +%define product_family CentOS-Stream +%define base_release_version 8 +%define full_release_version 8 +%define dist_release_version 8 +%define upstream_rel_long 8.0-0 +%define upstream_rel 8.0 +%define centos_rel 0.1905 +#define beta Beta +%define dist .el%{dist_release_version} + +# The anaconda scripts in %{_libexecdir} can create false requirements +%global __requires_exclude_from %{_libexecdir} + +Name: centos-release-stream +Version: %{upstream_rel} +Release: %{centos_rel}.0.9%{?dist} +Summary: %{product_family} release file +Group: System Environment/Base +License: GPLv2 + +%define pkg_name %{name} + +Provides: centos-release-stream = %{version}-%{release} +Requires: centos-release = %{version}-%{release} + +Source300: CentOS-Stream-Base.repo +Source302: CentOS-Stream-Debuginfo.repo +Source303: CentOS-Stream-Extras.repo +Source305: CentOS-Stream-Media.repo +Source306: CentOS-Stream-Sources.repo +Source307: CentOS-Stream-Vault.repo +Source308: CentOS-Stream-AppStream.repo +Source309: CentOS-Stream-PowerTools.repo +Source310: CentOS-Stream-centosplus.repo + +%ifarch %{arm} +%description -n %{pkg_name} +%{product_family} release files +%endif + +%description +%{product_family} release files + +%prep +echo OK + +%build +echo OK + +%install +rm -rf %{buildroot} + +# create /etc +mkdir -p %{buildroot}/etc + +# copy yum repos +mkdir -p -m 755 %{buildroot}/etc/yum.repos.d +install -m 644 %{SOURCE300} %{buildroot}/etc/yum.repos.d +install -m 644 %{SOURCE302} %{buildroot}/etc/yum.repos.d +install -m 644 %{SOURCE303} %{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 "%{base_release_version}-stream" > %{buildroot}/etc/dnf/vars/stream + +%clean +rm -rf %{buildroot} + +%files -n %{pkg_name} +%defattr(0644,root,root,0755) +%config(noreplace) /etc/yum.repos.d/* +%config(noreplace) /etc/dnf/vars/* + +%changelog +* Thu Sep 20 2019 Brian Stinson 8-0.el8 +- First build of centos-release-stream From 427eb780d85e62643efbb96305b6a15210cee26b Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Oct 14 2019 11:54:19 +0000 Subject: [PATCH 2/3] Enabled mirrorlist support for 8-stream, now supported by mirrorlist.centos.org nodes Signed-off-by: Fabian Arrotin --- diff --git a/SOURCES/CentOS-Stream-AppStream.repo b/SOURCES/CentOS-Stream-AppStream.repo index 9098dbe..95e84e3 100644 --- a/SOURCES/CentOS-Stream-AppStream.repo +++ b/SOURCES/CentOS-Stream-AppStream.repo @@ -12,8 +12,8 @@ [Stream-AppStream] name=CentOS-Stream - AppStream -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=AppStream&infra=$infra -baseurl=http://mirror.centos.org/$contentdir/$stream/AppStream/$basearch/os/ +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=AppStream&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/AppStream/$basearch/os/ gpgcheck=1 enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/SOURCES/CentOS-Stream-Base.repo b/SOURCES/CentOS-Stream-Base.repo index 1ca676e..3e3903b 100644 --- a/SOURCES/CentOS-Stream-Base.repo +++ b/SOURCES/CentOS-Stream-Base.repo @@ -12,8 +12,8 @@ [Stream-BaseOS] name=CentOS-Stream - Base -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS&infra=$infra -baseurl=http://mirror.centos.org/$contentdir/$stream/BaseOS/$basearch/os/ +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=BaseOS&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/BaseOS/$basearch/os/ gpgcheck=1 enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/SOURCES/CentOS-Stream-Extras.repo b/SOURCES/CentOS-Stream-Extras.repo index 00e7652..445c9f5 100644 --- a/SOURCES/CentOS-Stream-Extras.repo +++ b/SOURCES/CentOS-Stream-Extras.repo @@ -13,8 +13,8 @@ #additional packages that may be useful [Stream-extras] name=CentOS-Stream - Extras -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra -baseurl=http://mirror.centos.org/$contentdir/$stream/extras/$basearch/os/ +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=extras&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/extras/$basearch/os/ gpgcheck=1 enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/SOURCES/CentOS-Stream-PowerTools.repo b/SOURCES/CentOS-Stream-PowerTools.repo index 8ab2d02..7591820 100644 --- a/SOURCES/CentOS-Stream-PowerTools.repo +++ b/SOURCES/CentOS-Stream-PowerTools.repo @@ -12,8 +12,8 @@ [Stream-PowerTools] name=CentOS-Stream - PowerTools -#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra -baseurl=http://mirror.centos.org/$contentdir/$stream/PowerTools/$basearch/os/ +mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools&infra=$infra +#baseurl=http://mirror.centos.org/$contentdir/$stream/PowerTools/$basearch/os/ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial From 176906e567455aa1baaf6967cf0e3b84060a785c Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Oct 14 2019 12:03:05 +0000 Subject: [PATCH 3/3] Also bumped .spec for a rebuild Signed-off-by: Fabian Arrotin --- diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec index 1bc09aa..7b38296 100644 --- a/SPECS/centos-release.spec +++ b/SPECS/centos-release.spec @@ -14,7 +14,7 @@ Name: centos-release-stream Version: %{upstream_rel} -Release: %{centos_rel}.0.9%{?dist} +Release: %{centos_rel}.0.10%{?dist} Summary: %{product_family} release file Group: System Environment/Base License: GPLv2 @@ -78,5 +78,8 @@ rm -rf %{buildroot} %config(noreplace) /etc/dnf/vars/* %changelog +* Mon Oct 14 2019 Fabian Arrotin 8.0-0.1905.0.9.el8 +- Switched to mirrorlist instead of baseurl for 8-stream + * Thu Sep 20 2019 Brian Stinson 8-0.el8 - First build of centos-release-stream