From fe39c3bdd06a57e8015600785b5a73121348f188 Mon Sep 17 00:00:00 2001 From: Carl George Date: Sep 09 2020 14:52:51 +0000 Subject: Convert to centos-stream-release - Move all repo files, GPG keys, and dnf vars to centos-repos - Move rootfs-expand script to its own package - Switch to noarch - Upgrade path from centos-release/centos-release-stream combo - Upgrade path from centos-linux-release - Upgrade path from centos-userland-release - Set os-release variables to appropriate bugzilla values --- diff --git a/.centos-stream-release.metadata b/.centos-stream-release.metadata new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/.centos-stream-release.metadata diff --git a/SOURCES/CentOS-AppStream.repo b/SOURCES/CentOS-AppStream.repo deleted file mode 100644 index e6a7e0c..0000000 --- a/SOURCES/CentOS-AppStream.repo +++ /dev/null @@ -1,20 +0,0 @@ -# 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 deleted file mode 100644 index 0f8576d..0000000 --- a/SOURCES/CentOS-Base.repo +++ /dev/null @@ -1,20 +0,0 @@ -# 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. -# -# - -[BaseOS] -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=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-CR.repo b/SOURCES/CentOS-CR.repo deleted file mode 100644 index 70b579b..0000000 --- a/SOURCES/CentOS-CR.repo +++ /dev/null @@ -1,24 +0,0 @@ -# CentOS-CR.repo -# -# The Continuous Release ( CR ) repository contains rpms that are due in the next -# release for a specific CentOS Version ( eg. next release in CentOS-8 ); these rpms -# are far less tested, with no integration checking or update path testing having -# taken place. They are still built from the upstream sources, but might not map -# to an exact upstream distro release. -# -# These packages are made available soon after they are built, for people willing -# to test their environments, provide feedback on content for the next release, and -# for people looking for early-access to next release content. -# -# The CR repo is shipped in a disabled state by default; its important that users -# understand the implications of turning this on. -# - -[cr] -name=CentOS-$releasever - cr -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cr&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/cr/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-Debuginfo.repo b/SOURCES/CentOS-Debuginfo.repo deleted file mode 100644 index 064d1eb..0000000 --- a/SOURCES/CentOS-Debuginfo.repo +++ /dev/null @@ -1,21 +0,0 @@ -# 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 -# - -[base-debuginfo] -name=CentOS-$releasever - Debuginfo -baseurl=http://debuginfo.centos.org/$releasever/$basearch/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-Devel.repo b/SOURCES/CentOS-Devel.repo deleted file mode 100644 index 404fbd7..0000000 --- a/SOURCES/CentOS-Devel.repo +++ /dev/null @@ -1,19 +0,0 @@ -# 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 WARNING! FOR BUILDROOT USE ONLY! -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 deleted file mode 100644 index ab968d6..0000000 --- a/SOURCES/CentOS-Extras.repo +++ /dev/null @@ -1,21 +0,0 @@ -# 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 -[extras] -name=CentOS-$releasever - Extras -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/extras/$basearch/os/ -gpgcheck=1 -enabled=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-HA.repo b/SOURCES/CentOS-HA.repo deleted file mode 100644 index f533fe3..0000000 --- a/SOURCES/CentOS-HA.repo +++ /dev/null @@ -1,20 +0,0 @@ -# CentOS-HA.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. -# -# - -[HighAvailability] -name=CentOS-$releasever - HA -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=HighAvailability&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/HighAvailability/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-Media.repo b/SOURCES/CentOS-Media.repo deleted file mode 100644 index 6e17550..0000000 --- a/SOURCES/CentOS-Media.repo +++ /dev/null @@ -1,30 +0,0 @@ -# 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-media-BaseOS] -name=CentOS-BaseOS-$releasever - 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-media-AppStream] -name=CentOS-AppStream-$releasever - 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-PowerTools.repo b/SOURCES/CentOS-PowerTools.repo deleted file mode 100644 index ed34fa0..0000000 --- a/SOURCES/CentOS-PowerTools.repo +++ /dev/null @@ -1,20 +0,0 @@ -# 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. -# -# - -[PowerTools] -name=CentOS-$releasever - PowerTools -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/PowerTools/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-Sources.repo b/SOURCES/CentOS-Sources.repo deleted file mode 100644 index 59e1cda..0000000 --- a/SOURCES/CentOS-Sources.repo +++ /dev/null @@ -1,43 +0,0 @@ -# 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. -# -# - -[BaseOS-source] -name=CentOS-$releasever - BaseOS Sources -baseurl=http://vault.centos.org/$contentdir/$releasever/BaseOS/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - -#AppStream -[AppStream-source] -name=CentOS-$releasever - AppStream Sources -baseurl=http://vault.centos.org/$contentdir/$releasever/AppStream/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - -#additional packages that may be useful -[extras-source] -name=CentOS-$releasever - Extras Sources -baseurl=http://vault.centos.org/$contentdir/$releasever/extras/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - -#additional packages that extend functionality of existing packages -[centosplus-source] -name=CentOS-$releasever - Plus Sources -baseurl=http://vault.centos.org/$contentdir/$releasever/centosplus/Source/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-Vault.repo b/SOURCES/CentOS-Vault.repo deleted file mode 100644 index cf48d2a..0000000 --- a/SOURCES/CentOS-Vault.repo +++ /dev/null @@ -1,3 +0,0 @@ -# CentOS Vault contains rpms from older releases in the CentOS-8 -# tree. - diff --git a/SOURCES/CentOS-centosplus.repo b/SOURCES/CentOS-centosplus.repo deleted file mode 100644 index c035a41..0000000 --- a/SOURCES/CentOS-centosplus.repo +++ /dev/null @@ -1,21 +0,0 @@ -# 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/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/CentOS-fasttrack.repo b/SOURCES/CentOS-fasttrack.repo deleted file mode 100644 index 9aba30e..0000000 --- a/SOURCES/CentOS-fasttrack.repo +++ /dev/null @@ -1,10 +0,0 @@ -#CentOS-fasttrack.repo - -[fasttrack] -name=CentOS-$releasever - fasttrack -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra -#baseurl=http://mirror.centos.org/$contentdir/$releasever/fasttrack/$basearch/os/ -gpgcheck=1 -enabled=0 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial - diff --git a/SOURCES/RPM-GPG-KEY-centosofficial b/SOURCES/RPM-GPG-KEY-centosofficial deleted file mode 100644 index 30235a8..0000000 --- a/SOURCES/RPM-GPG-KEY-centosofficial +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) - -mQINBFzMWxkBEADHrskpBgN9OphmhRkc7P/YrsAGSvvl7kfu+e9KAaU6f5MeAVyn -rIoM43syyGkgFyWgjZM8/rur7EMPY2yt+2q/1ZfLVCRn9856JqTIq0XRpDUe4nKQ -8BlA7wDVZoSDxUZkSuTIyExbDf0cpw89Tcf62Mxmi8jh74vRlPy1PgjWL5494b3X -5fxDidH4bqPZyxTBqPrUFuo+EfUVEqiGF94Ppq6ZUvrBGOVo1V1+Ifm9CGEK597c -aevcGc1RFlgxIgN84UpuDjPR9/zSndwJ7XsXYvZ6HXcKGagRKsfYDWGPkA5cOL/e -f+yObOnC43yPUvpggQ4KaNJ6+SMTZOKikM8yciyBwLqwrjo8FlJgkv8Vfag/2UR7 -JINbyqHHoLUhQ2m6HXSwK4YjtwidF9EUkaBZWrrskYR3IRZLXlWqeOi/+ezYOW0m -vufrkcvsh+TKlVVnuwmEPjJ8mwUSpsLdfPJo1DHsd8FS03SCKPaXFdD7ePfEjiYk -nHpQaKE01aWVSLUiygn7F7rYemGqV9Vt7tBw5pz0vqSC72a5E3zFzIIuHx6aANry -Gat3aqU3qtBXOrA/dPkX9cWE+UR5wo/A2UdKJZLlGhM2WRJ3ltmGT48V9CeS6N9Y -m4CKdzvg7EWjlTlFrd/8WJ2KoqOE9leDPeXRPncubJfJ6LLIHyG09h9kKQARAQAB -tDpDZW50T1MgKENlbnRPUyBPZmZpY2lhbCBTaWduaW5nIEtleSkgPHNlY3VyaXR5 -QGNlbnRvcy5vcmc+iQI3BBMBAgAhBQJczFsZAhsDBgsJCAcDAgYVCAIJCgsDFgIB -Ah4BAheAAAoJEAW1VbOEg8ZdjOsP/2ygSxH9jqffOU9SKyJDlraL2gIutqZ3B8pl -Gy/Qnb9QD1EJVb4ZxOEhcY2W9VJfIpnf3yBuAto7zvKe/G1nxH4Bt6WTJQCkUjcs -N3qPWsx1VslsAEz7bXGiHym6Ay4xF28bQ9XYIokIQXd0T2rD3/lNGxNtORZ2bKjD -vOzYzvh2idUIY1DgGWJ11gtHFIA9CvHcW+SMPEhkcKZJAO51ayFBqTSSpiorVwTq -a0cB+cgmCQOI4/MY+kIvzoexfG7xhkUqe0wxmph9RQQxlTbNQDCdaxSgwbF2T+gw -byaDvkS4xtR6Soj7BKjKAmcnf5fn4C5Or0KLUqMzBtDMbfQQihn62iZJN6ZZ/4dg -q4HTqyVpyuzMXsFpJ9L/FqH2DJ4exGGpBv00ba/Zauy7GsqOc5PnNBsYaHCply0X -407DRx51t9YwYI/ttValuehq9+gRJpOTTKp6AjZn/a5Yt3h6jDgpNfM/EyLFIY9z -V6CXqQQ/8JRvaik/JsGCf+eeLZOw4koIjZGEAg04iuyNTjhx0e/QHEVcYAqNLhXG -rCTTbCn3NSUO9qxEXC+K/1m1kaXoCGA0UWlVGZ1JSifbbMx0yxq/brpEZPUYm+32 -o8XfbocBWljFUJ+6aljTvZ3LQLKTSPW7TFO+GXycAOmCGhlXh2tlc6iTc41PACqy -yy+mHmSv -=kkH7 ------END PGP PUBLIC KEY BLOCK----- diff --git a/SOURCES/RPM-GPG-KEY-centostesting b/SOURCES/RPM-GPG-KEY-centostesting deleted file mode 100644 index 635206d..0000000 --- a/SOURCES/RPM-GPG-KEY-centostesting +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) - -mQINBFzMYBIBEACzbPN6Yso1qkcpVTnpfUxVWUpcWcuMiWpKSsZKkT2k9nOVVc7v -aaLUkKY1WoD3+FoE8fDReTgiwbGFyB9EVC2erwjqQsVr6x7ntVjxX5eFniRZ3O1+ -ez3mBWhTfAXo7QoobZPnGeh8eL+lI2Yli/bf3gFGYB9xmv/WptokwvN379XtjP3F -eFfHlCDpBEWL4ISZ4V6BRlIspnWd8A2FbV3byK5DMiKLpU/qnSPcXY4/OfWwn4HK -Of/RFqOJZrJgy2HEmf3XDFHbg7OiGr80Fsc2UuSBQo5MkXckpBVAF7QmhGoRC4V0 -5xgr2Z5Lh2OZhMtLJDYolvrNcdyNvjcfri6QYS55dBpctNbG49OMmw+niy5uJ0KA -MTXPNmyQ3Xtz3Smh8T6yj8iPyHkF7g2JC2xUzp6zijwDjRrDtGpnhrCmOPVlQAph -Os6prHwDa3N3OFubKhFscftkjAElgHVb97U6gabU9BJsLPcMV+HkW3sm8nx2Q9eh -Ew5CfvirSI8RFifOpDid99KSo/Id+wrTqW10Q/wfyFcGkrKo1fVpEkkDGc1nWKQS -+K5MMQsyweohFQvy+yKX2LXhYjDBpopd4KKZJNhR+UDncD7shaKM2yIUp11W7Oe1 -DkeXME7GvGiB48Trcz38osYTzCqxvzXegFQ01PuiYdxjnYZfWlcl3xaUKwARAQAB -tD1DZW50T1MgVGVzdGluZyAoQ2VudE9TIFRlc3RpbmcgY29udGVudCkgPHNlY3Vy -aXR5QGNlbnRvcy5vcmc+iQI3BBMBAgAhBQJczGASAhsDBgsJCAcDAgYVCAIJCgsD -FgIBAh4BAheAAAoJEHYuZYVbpfqNL1gP/jeWOFd7Pcn8FxLQl3IVheHe/5U0z+FO -0rkmr1aLTzoO2Os22DXvcXHHMRxFXjE/xDA8SDp8hNtiU5o7t6z0ZDaDrFo2Cap2 -8MEqhSmDFmezBEV70xaKHtWTkupf4PYZkGzv8flGeOSjVsjN/KaCvWs5n4fq5nTE -Vk2HdxUsXNso8+Z80MqAbtoFYQi63LeRW7pT3D3Y4vCLpjihJwWLYHJrhFvt1WHo -g7az6JoEeHL5lgcOnTt8OsveZk3ih9cONzmlnaRJaaoo6Y7CdtbPu6dVGhRTySto -fZ1MCTrhqZ/Pn8Vgda6kPGq69UcbQ2XvDrHt1q/mLvJsgPY+3E5jgU2buo3YaUfB -Yb9b8ExNpeNCNbxz45FXw6JymtC+YvRipThptuigUngAY+Lpp0ibF/U5Qwox8w/7 -BnTcmT/lh3bGZH3AvWJpflD/WN2qplhXU5KsGIyyFTxGA8bXtbYTnMCwL7XpwXPa -GfMdI/anERDd6l4dxOFWGkLcwZ8PmkLCH52EgPWyd403LPSoukVmupJ42D3hSE7e -9l7FU2hsX5E00zsKTbE7EBUUsP67Ah9N2w3DaEE8XxMCikLN5ok012OjIIQGOEoK -aK0K9fVkSyrpIacOQ0k3wBDuKpYYTsRRi+yS8oTfUO+ExM09SlqElyvnKntar18l -H5XnTNztBtX9 -=p0y+ ------END PGP PUBLIC KEY BLOCK----- diff --git a/SOURCES/rootfs-expand b/SOURCES/rootfs-expand deleted file mode 100755 index 730b9b9..0000000 --- a/SOURCES/rootfs-expand +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -clear -part=$(mount |grep '^/dev.* / ' |awk '{print $1}') -if [ -z "$part" ];then - echo "Error detecting rootfs" - exit -1 -fi -dev=$(echo $part|sed 's/[0-9]*$//g') -devlen=${#dev} -num=${part:$devlen} -if [[ "$dev" =~ ^/dev/mmcblk[0-9]*p$ ]];then - dev=${dev:0:-1} -fi -if [ ! -x /usr/bin/growpart ];then - echo "Please install cloud-utils-growpart (sudo yum install cloud-utils-growpart)" - exit -2 -fi -if [ ! -x /usr/sbin/resize2fs ];then - echo "Please install e2fsprogs (sudo yum install e2fsprogs)" - exit -3 -fi -echo $part $dev $num - -echo "Extending partition $num to max size ...." -growpart $dev $num -echo "Resizing ext4 filesystem ..." -resize2fs $part -echo "Done." -df -h |grep $part - diff --git a/SPECS/centos-stream-release.spec b/SPECS/centos-stream-release.spec index abe3a1b..029a079 100644 --- a/SPECS/centos-stream-release.spec +++ b/SPECS/centos-stream-release.spec @@ -1,256 +1,142 @@ -%define debug_package %{nil} -%define product_family CentOS Linux -%define variant_titlecase Server -%define variant_lowercase server -%ifarch %{arm} -%define release_name AltArch -%define contentdir altarch -%else -%define release_name Core -%define contentdir centos -%endif -%ifarch ppc64le -%define tuned_profile :server -%endif -%define infra_var stock -%define base_release_version 8 -%define full_release_version 8 -%define dist_release_version 8 -%define upstream_rel_long 8.2-0 -%define upstream_rel 8.2 -%define centos_rel 2.2004 -#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 -Version: %{upstream_rel} -Release: %{centos_rel}.0.1%{?dist} -Summary: %{product_family} release file -Group: System Environment/Base +%global distro CentOS Stream +%global major 8 + +Name: centos-stream-release +Version: %{major}.3 +Release: 1%{?dist} +Summary: %{distro} release files License: GPLv2 -%ifnarch %{arm} -%define pkg_name %{name} -%else -%define pkg_name centos-userland-release -%package -n %{pkg_name} -Summary: %{product_family} release file -%endif +URL: https://centos.org +BuildArch: noarch + +# upgrade path from centos-release/centos-release-stream combo +Obsoletes: centos-release < 8.2-3 Provides: centos-release = %{version}-%{release} -Provides: centos-release(upstream) = %{upstream_rel} -Provides: redhat-release = %{upstream_rel_long} -Provides: system-release = %{upstream_rel_long} -Provides: system-release(releasever) = %{base_release_version} -Provides: base-module(platform:el%{base_release_version}) +Obsoletes: centos-release-stream < 8.3-4 +Provides: centos-release-stream = %{version}-%{release} + +# upgrade path from CentOS Linux +Obsoletes: centos-linux-release < %{version}-%{release} -Provides: centos-release-eula -Provides: redhat-release-eula +# upgrade path from CentOS AltArch +Obsoletes: centos-userland-release < %{version}-%{release} -Requires: centos-gpg-keys = %{version}-%{release} -Requires: centos-repos >= %{version}-%{release} +# required by epel-release +Provides: redhat-release = %{version}-%{release} -Source1: 85-display-manager.preset -Source2: 90-default.preset -Source3: 99-default-disable.preset -Source10: RPM-GPG-KEY-centosofficial -Source11: RPM-GPG-KEY-centostesting +# required by dnf +# https://github.com/rpm-software-management/dnf/blob/4.2.23/dnf/const.py.in#L26 +Provides: system-release = %{version}-%{release} +Provides: system-release(releasever) = %{major} -Source100: rootfs-expand +# required by libdnf +# https://github.com/rpm-software-management/libdnf/blob/0.48.0/libdnf/module/ModulePackage.cpp#L472 +Provides: base-module(platform:el%{major}) Source200: EULA Source201: GPL Source202: Contributors -Source300: CentOS-Base.repo -Source301: CentOS-CR.repo -Source302: CentOS-Debuginfo.repo -Source303: CentOS-Extras.repo -Source304: CentOS-fasttrack.repo -Source305: CentOS-Media.repo -Source306: CentOS-Sources.repo -Source307: CentOS-Vault.repo -Source308: CentOS-AppStream.repo -Source309: CentOS-PowerTools.repo -Source310: CentOS-centosplus.repo -Source311: CentOS-HA.repo -Source312: CentOS-Devel.repo - -%ifarch %{arm} -%description -n %{pkg_name} -%{product_family} release files -%endif - -%description -%{product_family} release files - -%package -n centos-repos -Summary: %{product_family} package repositories -Group: System Environment/Base -Provides: centos-repos(%{base_release_version}) = %{upstream_rel} -Requires: system-release = %{upstream_rel} -Requires: centos-gpg-keys = %{version}-%{release} -Conflicts: %{name} < 8.0-0.1905.0.10 - -%description -n centos-repos -%{product_family} package repository files for yum and dnf - -%package -n centos-gpg-keys -Summary: %{product_family} RPM keys -Group: System Environment/Base -Conflicts: %{name} < 8.0-0.1905.0.10 -BuildArch: noarch +Source300: 85-display-manager.preset +Source301: 90-default.preset +Source302: 99-default-disable.preset -%description -n centos-gpg-keys -%{product_family} RPM signature keys -%prep -echo OK +%description +%{distro} release files. -%build -echo OK %install -rm -rf %{buildroot} - -# create skeleton -mkdir -p %{buildroot}/etc -mkdir -p %{buildroot}%{_prefix}/lib - # create /etc/system-release and /etc/redhat-release -echo "%{product_family} release %{full_release_version}.%{centos_rel} (%{release_name}) " > %{buildroot}/etc/centos-release -echo "Derived from Red Hat Enterprise Linux %{upstream_rel} (Source)" > %{buildroot}/etc/centos-release-upstream -ln -s centos-release %{buildroot}/etc/system-release -ln -s centos-release %{buildroot}/etc/redhat-release +install -d -m 0755 %{buildroot}%{_sysconfdir} +echo "%{distro} release %{major}" > %{buildroot}%{_sysconfdir}/centos-release +ln -s centos-release %{buildroot}%{_sysconfdir}/system-release +ln -s centos-release %{buildroot}%{_sysconfdir}/redhat-release # Create the os-release file -cat << EOF >>%{buildroot}%{_prefix}/lib/os-release -NAME="%{product_family}" -VERSION="%{full_release_version} (%{release_name})" +install -d -m 0755 %{buildroot}%{_prefix}/lib +cat > %{buildroot}%{_prefix}/lib/os-release << EOF +NAME="%{distro}" +VERSION="%{major}" ID="centos" ID_LIKE="rhel fedora" -VERSION_ID="%{full_release_version}" -PLATFORM_ID="platform:el%{base_release_version}" -PRETTY_NAME="%{product_family} %{full_release_version} (%{release_name})" +VERSION_ID="%{major}" +PLATFORM_ID="platform:el%{major}" +PRETTY_NAME="%{distro} %{major}" ANSI_COLOR="0;31" -CPE_NAME="cpe:/o:centos:centos:%{base_release_version}%{?tuned_profile}" -HOME_URL="https://www.centos.org/" -BUG_REPORT_URL="https://bugs.centos.org/" - -CENTOS_MANTISBT_PROJECT="CentOS-%{base_release_version}" -CENTOS_MANTISBT_PROJECT_VERSION="%{base_release_version}" -REDHAT_SUPPORT_PRODUCT="centos" -REDHAT_SUPPORT_PRODUCT_VERSION="%{base_release_version}" - +CPE_NAME="cpe:/o:centos:centos:%{major}" +HOME_URL="https://centos.org/" +BUG_REPORT_URL="https://bugzilla.redhat.com/" +REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux %{major}" +REDHAT_SUPPORT_PRODUCT_VERSION="%{distro}" EOF + # Create the symlink for /etc/os-release ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release # write cpe to /etc/system/release-cpe -echo "cpe:/o:centos:centos:%{base_release_version}" > %{buildroot}/etc/system-release-cpe +echo "cpe:/o:centos:centos:%{major}" > %{buildroot}%{_sysconfdir}/system-release-cpe # create /etc/issue and /etc/issue.net -echo '\S' > %{buildroot}/etc/issue -echo 'Kernel \r on an \m' >> %{buildroot}/etc/issue -cp %{buildroot}/etc/issue %{buildroot}/etc/issue.net -echo >> %{buildroot}/etc/issue - -# copy GPG keys -mkdir -p -m 755 %{buildroot}/etc/pki/rpm-gpg -install -m 644 %{SOURCE10} %{buildroot}/etc/pki/rpm-gpg -install -m 644 %{SOURCE11} %{buildroot}/etc/pki/rpm-gpg - -# copy yum repos -mkdir -p -m 755 %{buildroot}/etc/yum.repos.d -install -m 644 %{SOURCE300} %{buildroot}/etc/yum.repos.d -install -m 644 %{SOURCE301} %{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 %{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 -install -m 644 %{SOURCE311} %{buildroot}/etc/yum.repos.d -install -m 644 %{SOURCE312} %{buildroot}/etc/yum.repos.d - -mkdir -p -m 755 %{buildroot}/etc/dnf/vars -echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra -echo "%{contentdir}" >%{buildroot}/etc/dnf/vars/contentdir -%ifarch %{arm} -echo %{base_release_version} > %{buildroot}/etc/dnf/vars/releasever -%endif +echo '\S' > %{buildroot}%{_sysconfdir}/issue +echo 'Kernel \r on an \m' >> %{buildroot}%{_sysconfdir}/issue +cp %{buildroot}%{_sysconfdir}/issue{,.net} +echo >> %{buildroot}%{_sysconfdir}/issue # set up the dist tag macros -install -d -m 755 %{buildroot}/etc/rpm -cat >> %{buildroot}/etc/rpm/macros.dist << EOF +install -d -m 0755 %{buildroot}%{_sysconfdir}/rpm +cat > %{buildroot}%{_sysconfdir}/rpm/macros.dist << EOF # dist macros. -%%centos_ver %{base_release_version} -%%centos %{base_release_version} -%%rhel %{base_release_version} -%%dist .el%{base_release_version} -%%el%{base_release_version} 1 +%%centos_ver %{major} +%%centos %{major} +%%rhel %{major} +%%dist .el%{major} +%%el%{major} 1 EOF # use unbranded datadir -mkdir -p -m 755 %{buildroot}/%{_datadir}/centos-release -ln -s centos-release %{buildroot}/%{_datadir}/redhat-release -install -m 644 %{SOURCE200} %{buildroot}/%{_datadir}/centos-release +install -d -m 0755 %{buildroot}%{_datadir}/centos-release +ln -s centos-release %{buildroot}%{_datadir}/redhat-release +install -p -m 0644 %{SOURCE200} %{buildroot}%{_datadir}/centos-release/ # use unbranded docdir -mkdir -p -m 755 %{buildroot}/%{_docdir}/centos-release -ln -s centos-release %{buildroot}/%{_docdir}/redhat-release -install -m 644 %{SOURCE201} %{buildroot}/%{_docdir}/centos-release -install -m 644 %{SOURCE202} %{buildroot}/%{_docdir}/centos-release +install -d -m 0755 %{buildroot}%{_docdir}/centos-release +ln -s centos-release %{buildroot}%{_docdir}/redhat-release +install -p -m 0644 %{SOURCE201} %{buildroot}%{_docdir}/centos-release/ +install -p -m 0644 %{SOURCE202} %{buildroot}%{_docdir}/centos-release/ # copy systemd presets -mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system-preset/ -install -m 0644 %{SOURCE1} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ -install -m 0644 %{SOURCE2} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ -install -m 0644 %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/system-preset/ - -%ifarch %{arm} aarch64 -# Install armhfp/aarch64 specific tools -install -D -m 0755 %{SOURCE100} %{buildroot}%{_bindir}/rootfs-expand -%endif - - -%clean -rm -rf %{buildroot} - -%files -n %{pkg_name} -%defattr(0644,root,root,0755) -/etc/redhat-release -/etc/system-release -/etc/centos-release -/etc/centos-release-upstream -%config(noreplace) /etc/os-release -%config /etc/system-release-cpe -%config(noreplace) /etc/issue -%config(noreplace) /etc/issue.net -/etc/rpm/macros.dist +install -d -m 0755 %{buildroot}%{_prefix}/lib/systemd/system-preset/ +install -p -m 0644 %{SOURCE300} %{buildroot}%{_prefix}/lib/systemd/system-preset/ +install -p -m 0644 %{SOURCE301} %{buildroot}%{_prefix}/lib/systemd/system-preset/ +install -p -m 0644 %{SOURCE302} %{buildroot}%{_prefix}/lib/systemd/system-preset/ + + +%files +%{_sysconfdir}/redhat-release +%{_sysconfdir}/system-release +%{_sysconfdir}/centos-release +%config(noreplace) %{_sysconfdir}/os-release +%config %{_sysconfdir}/system-release-cpe +%config(noreplace) %{_sysconfdir}/issue +%config(noreplace) %{_sysconfdir}/issue.net +%{_sysconfdir}/rpm/macros.dist %{_docdir}/redhat-release -%{_docdir}/centos-release/* +%{_docdir}/centos-release %{_datadir}/redhat-release -%{_datadir}/centos-release/* +%{_datadir}/centos-release %{_prefix}/lib/os-release %{_prefix}/lib/systemd/system-preset/* %ifarch %{arm} aarch64 %attr(0755,root,root) %{_bindir}/rootfs-expand %endif -%files -n centos-repos -%config(noreplace) /etc/yum.repos.d/* -%config(noreplace) /etc/dnf/vars/* - -%files -n centos-gpg-keys -/etc/pki/rpm-gpg/ %changelog +* Wed Sep 02 2020 Carl George - 8.3-1 +- Convert to centos-stream-release + * Fri May 15 2020 Pablo Greco - 8-2.0.1 - Relax dependency for centos-repos - Remove update_boot, it was never used in 8