From ba800334930dfe12b18581f75cbb8e03280ec574 Mon Sep 17 00:00:00 2001 From: Andrei Lukoshko Date: Fri, 16 Apr 2021 17:15:57 +0300 Subject: [PATCH] 8.3 stable --- almalinux-ha.repo | 30 ++++++++++++++++ almalinux-release.spec | 31 ++++++++++++----- almalinux.repo | 79 ++++++++++++++++++++++++++---------------- 3 files changed, 101 insertions(+), 39 deletions(-) create mode 100644 almalinux-ha.repo diff --git a/almalinux-ha.repo b/almalinux-ha.repo new file mode 100644 index 0000000..f89c70c --- /dev/null +++ b/almalinux-ha.repo @@ -0,0 +1,30 @@ +# almalinux-ha.repo + +[ha] +name=AlmaLinux $releasever - HighAvailability +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha +# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 + +## Sources +[ha-source] +name=AlmaLinux $releasever - HighAvailability Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-source +# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/Source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 + +## Debuginfo +[ha-debuginfo] +name=AlmaLinux $releasever - HighAvailability debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/debug/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 diff --git a/almalinux-release.spec b/almalinux-release.spec index d1e9dba..915dff0 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -10,7 +10,7 @@ %define dist_release_version 8 %define upstream_rel_long 8.3-1 %define upstream_rel 8.3 -%define almalinux_rel 2 +%define almalinux_rel 4 %define dist .el%{dist_release_version} # The anaconda scripts in %%{_libexecdir} can create false requirements @@ -47,6 +47,7 @@ Source201: GPL ##Source202: Contributors Source300: almalinux.repo +Source301: almalinux-ha.repo %description %{product_family} release files @@ -65,7 +66,7 @@ mkdir -p %{buildroot}/etc mkdir -p %{buildroot}%{_prefix}/lib # create /etc/system-release and /etc/redhat-release -echo "%{product_family} release %{full_release_version} %{?beta:Beta} (%{release_name})" > %{buildroot}/etc/almalinux-release +echo "%{product_family} release %{full_release_version}%{?beta: %{beta}} (%{release_name})" > %{buildroot}/etc/almalinux-release echo "Derived from Red Hat Enterprise Linux %{upstream_rel} (Source)" > %{buildroot}/etc/almalinux-release-upstream ln -s almalinux-release %{buildroot}/etc/system-release ln -s almalinux-release %{buildroot}/etc/redhat-release @@ -79,22 +80,22 @@ ID="almalinux" ID_LIKE="rhel centos fedora" VERSION_ID="%{full_release_version}" PLATFORM_ID="platform:el%{base_release_version}" -PRETTY_NAME="%{product_family} %{full_release_version} %{?beta:Beta} (%{release_name})" +PRETTY_NAME="%{product_family} %{full_release_version}%{?beta: %{beta}} (%{release_name})" ANSI_COLOR="0;34" -CPE_NAME="cpe:/o:almalinux:almalinux:%{full_release_version}:%{?beta:beta}%{!?beta:GA}" +CPE_NAME="cpe:/o:almalinux:almalinux:%{full_release_version}:%{?beta:%(echo %{beta} | tr [A-Z] [a-z])}%{?!beta:GA}" HOME_URL="https://almalinux.org/" BUG_REPORT_URL="https://bugs.almalinux.org/" -ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{base_release_version}" -ALMALINUX_MANTISBT_PROJECT_VERSION="%{base_release_version}" +ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{base_release_version}" +ALMALINUX_MANTISBT_PROJECT_VERSION="%{full_release_version}" 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:almalinux:almalinux:%{full_release_version}:%{?beta:Beta}%{!?beta:GA}" | tr [A-Z] [a-z] > %{buildroot}/etc/system-release-cpe +# write cpe to /etc/system-release-cpe +echo "cpe:/o:almalinux:almalinux:%{full_release_version}:%{?beta:%{beta}}%{?!beta:ga}" | tr [A-Z] [a-z] > %{buildroot}/etc/system-release-cpe # create /etc/issue and /etc/issue.net echo '\S' > %{buildroot}/etc/issue @@ -109,6 +110,7 @@ install -m 644 %{SOURCE10} %{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 mkdir -p -m 755 %{buildroot}/etc/dnf/vars echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra @@ -120,6 +122,8 @@ cat >> %{buildroot}/etc/rpm/macros.dist << EOF # dist macros. %%almalinux_ver %{base_release_version} +%%almalinux %{base_release_version} +%%centos_ver %{base_release_version} %%centos %{base_release_version} %%rhel %{base_release_version} %%dist .el%{base_release_version} @@ -156,7 +160,8 @@ rm -rf %{buildroot} /etc/almalinux-release-upstream /etc/dnf/ /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux -/etc/yum.repos.d/almalinux.repo +%config(noreplace) /etc/yum.repos.d/almalinux.repo +%config(noreplace) /etc/yum.repos.d/almalinux-ha.repo %config(noreplace) /etc/os-release %config /etc/system-release-cpe %config(noreplace) /etc/issue @@ -170,5 +175,13 @@ rm -rf %{buildroot} %{_prefix}/lib/systemd/system-preset/* %changelog +* Wed Mar 24 2021 Andrei Lukoshko - 8.3-4 +- 8.3 stable release + +* Wed Feb 10 2021 Andrei Lukoshko - 8.3-3 +- Switch repos to mirrorlists and enable fastestmirror plugin +- Use full release version for ALMALINUX_MANTISBT_PROJECT_VERSION +- Add HighAvailability repo + * Wed Jan 27 2021 Anatholy Scryabin - 8.3-2 - Initial build for AlmaLinux diff --git a/almalinux.repo b/almalinux.repo index 6d05e6b..485a8c9 100644 --- a/almalinux.repo +++ b/almalinux.repo @@ -1,92 +1,111 @@ # almalinux.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 AlmaLinux updates -# unless you are manually picking other mirrors. -# + [baseos] -name=AlmaLinux 8.3 - BaseOS -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/BaseOS/$basearch/os/ +name=AlmaLinux $releasever - BaseOS +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos +# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [appstream] -name=AlmaLinux 8.3 - AppStream -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/AppStream/$basearch/os/ +name=AlmaLinux $releasever - AppStream +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream +# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [powertools] -name=AlmaLinux 8.3 - PowerTools -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/PowerTools/$basearch/os/ +name=AlmaLinux $releasever - PowerTools +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools +# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [extras] -name=AlmaLinux 8.3 - Extras -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/extras/$basearch/os/ +name=AlmaLinux $releasever - Extras +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras +# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/ enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 ## Sources [baseos-source] -name=AlmaLinux 8.3 - BaseOS Source -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/BaseOS/Source/ +name=AlmaLinux $releasever - BaseOS Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source +# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [appstream-source] -name=AlmaLinux 8.3 - AppStream Source -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/AppStream/Source/ +name=AlmaLinux $releasever - AppStream Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source +# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [powertools-source] -name=AlmaLinux 8.3 - PowerTools Source -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/PowerTools/Source/ +name=AlmaLinux $releasever - PowerTools Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source +# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [extras-source] -name=AlmaLinux 8.3 - Extras Source -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/extras/Source/ +name=AlmaLinux $releasever - Extras Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source +# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 ## Debuginfo [baseos-debuginfo] -name=AlmaLinux 8.3 - BaseOS debuginfo -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/BaseOS/debug/$basearch/ +name=AlmaLinux $releasever - BaseOS debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [appstream-debuginfo] -name=AlmaLinux 8.3 - AppStream debuginfo -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/AppStream/debug/$basearch/ +name=AlmaLinux $releasever - AppStream debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [powertools-debuginfo] -name=AlmaLinux 8.3 - PowerTools debuginfo -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/PowerTools/debug/$basearch/ +name=AlmaLinux $releasever - PowerTools debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1 [extras-debuginfo] -name=AlmaLinux 8.3 - Extras debuginfo -baseurl=https://repo.almalinux.org/almalinux/8.3-beta/extras/debug/$basearch/ +name=AlmaLinux $releasever - Extras debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux +fastestmirror=1