From e28958e9e2591512f3fdaa208de7c361a31e5c1e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 11 Oct 2022 14:09:21 +0300 Subject: [PATCH] - Update for 8.7 beta - Bump Epoch --- 90-default.preset | 3 ++ almalinux-ha.repo | 19 ++++++----- almalinux-nfv.repo | 18 +++++------ almalinux-powertools.repo | 19 ++++++----- almalinux-release.spec | 32 +++++++++--------- almalinux-resilientstorage.repo | 19 ++++++----- almalinux-rt.repo | 18 +++++------ almalinux.repo | 57 ++++++++++++++++----------------- 8 files changed, 92 insertions(+), 93 deletions(-) diff --git a/90-default.preset b/90-default.preset index d242391..7b67ab3 100644 --- a/90-default.preset +++ b/90-default.preset @@ -194,3 +194,6 @@ enable dbus-daemon.service # enable nfs-client.target # https://bugzilla.redhat.com/show_bug.cgi?id=1967515 enable nfs-client.target + +# https://bugzilla.redhat.com/show_bug.cgi?id=2106814 +enable clevis-luks-askpass.path diff --git a/almalinux-ha.repo b/almalinux-ha.repo index 9c409a4..42c2c2a 100644 --- a/almalinux-ha.repo +++ b/almalinux-ha.repo @@ -1,28 +1,27 @@ # 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/ +name=AlmaLinux 8.7-beta - High Availability +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha +# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/HighAvailability/$basearch/os/ enabled=0 gpgcheck=1 -countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Sources [ha-source] -name=AlmaLinux $releasever - HighAvailability Source -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-source -# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/Source/ +name=AlmaLinux 8.7-beta - High Availability Sources +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha-source +# baseurl=https://repo.almalinux.org/vault/8.7-beta/HighAvailability/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Debuginfo [ha-debuginfo] -name=AlmaLinux $releasever - HighAvailability debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/ha-debuginfo -# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/ +name=AlmaLinux 8.7-beta - High Availability Debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/ha-debuginfo +# baseurl=https://repo.almalinux.org/vault/8.7-beta/HighAvailability/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux diff --git a/almalinux-nfv.repo b/almalinux-nfv.repo index 66028ab..c812b2a 100644 --- a/almalinux-nfv.repo +++ b/almalinux-nfv.repo @@ -1,27 +1,27 @@ # almalinux-nfv.repo [nfv] -name=AlmaLinux 8.6-beta - Real Time for NFV -mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv -# baseurl=https://repo.almalinux.org/almalinux/8.6-beta/NFV/$basearch/os/ +name=AlmaLinux 8.7-beta - Real Time for NFV +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/nfv +# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/NFV/$basearch/os/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Sources [nfv-source] -name=AlmaLinux 8.6-beta - Real Time for NFV Sources -mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv-source -# baseurl=https://repo.almalinux.org/vault/8.6-beta/NFV/Source/ +name=AlmaLinux 8.7-beta - Real Time for NFV Sources +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/nfv-source +# baseurl=https://repo.almalinux.org/vault/8.7-beta/NFV/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Debuginfo [nfv-debuginfo] -name=AlmaLinux 8.6-beta - Real Time for NFV Debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.6-beta/nfv-debuginfo -# baseurl=https://repo.almalinux.org/vault/8.6-beta/NFV/debug/$basearch/ +name=AlmaLinux 8.7-beta - Real Time for NFV Debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/nfv-debuginfo +# baseurl=https://repo.almalinux.org/vault/8.7-beta/NFV/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux diff --git a/almalinux-powertools.repo b/almalinux-powertools.repo index 26f76c8..f4eaefb 100644 --- a/almalinux-powertools.repo +++ b/almalinux-powertools.repo @@ -1,28 +1,27 @@ # almalinux-powertools.repo [powertools] -name=AlmaLinux $releasever - PowerTools -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools -# baseurl=https://repo.almalinux.org/almalinux/$releasever/PowerTools/$basearch/os/ +name=AlmaLinux 8.7-beta - PowerTools +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools +# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/PowerTools/$basearch/os/ enabled=0 gpgcheck=1 -countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Sources [powertools-source] -name=AlmaLinux $releasever - PowerTools Source -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-source -# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/Source/ +name=AlmaLinux 8.7-beta - PowerTools Sources +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools-source +# baseurl=https://repo.almalinux.org/vault/8.7-beta/PowerTools/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Debuginfo [powertools-debuginfo] -name=AlmaLinux $releasever - PowerTools debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/powertools-debuginfo -# baseurl=https://repo.almalinux.org/vault/$releasever/PowerTools/debug/$basearch/ +name=AlmaLinux 8.7-beta - PowerTools Debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/powertools-debuginfo +# baseurl=https://repo.almalinux.org/vault/8.7-beta/PowerTools/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux diff --git a/almalinux-release.spec b/almalinux-release.spec index 85325b5..4b08bbf 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -1,21 +1,23 @@ %define debug_package %{nil} %define product_family AlmaLinux -%define release_name Sky Tiger +%define release_name Stone Smilodon %define contentdir almalinux %define infra_var stock %define base_release_version 8 -%define full_release_version 8.6 +%define full_release_version 8.7 %define dist_release_version 8 -%define upstream_rel_long 8.6-0.1 -%define upstream_rel 8.6 -%define almalinux_rel 0.1 +%define upstream_rel_long 8.7-0.2 +%define upstream_rel 8.7 +%define almalinux_rel 0.2 %define dist .el%{dist_release_version} +%define beta Beta + # The anaconda scripts in %%{_libexecdir} can create false requirements %global __requires_exclude_from %{_libexecdir} Name: almalinux-release -Epoch: 1 +Epoch: 2 Version: %{upstream_rel} Release: %{almalinux_rel}%{?dist} Summary: %{product_family} release file @@ -49,10 +51,10 @@ Source300: almalinux.repo Source301: almalinux-ha.repo Source302: almalinux-powertools.repo Source303: almalinux-resilientstorage.repo -Source304: almalinux-plus.repo + # Only for x86_64 -Source305: almalinux-rt.repo -Source306: almalinux-nfv.repo +Source304: almalinux-rt.repo +Source305: almalinux-nfv.repo %description %{product_family} release files @@ -87,6 +89,7 @@ VERSION_ID="%{full_release_version}" PLATFORM_ID="platform:el%{base_release_version}" PRETTY_NAME="%{product_family} %{full_release_version}%{?beta: %{beta}} (%{release_name})" ANSI_COLOR="0;34" +LOGO="fedora-logo-icon" CPE_NAME="cpe:/o:almalinux:almalinux:%{base_release_version}::baseos" HOME_URL="https://almalinux.org/" DOCUMENTATION_URL="https://wiki.almalinux.org/" @@ -94,7 +97,8 @@ BUG_REPORT_URL="https://bugs.almalinux.org/" ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{base_release_version}" ALMALINUX_MANTISBT_PROJECT_VERSION="%{full_release_version}" - +REDHAT_SUPPORT_PRODUCT="%{product_family}" +REDHAT_SUPPORT_PRODUCT_VERSION="%{full_release_version}%{?beta: %{beta}}" EOF # Create the symlink for /etc/os-release @@ -119,12 +123,11 @@ 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 # RT and NFV are only for x86_64 %ifarch x86_64 +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 %endif mkdir -p -m 755 %{buildroot}/etc/dnf/vars @@ -179,7 +182,6 @@ rm -rf %{buildroot} %config(noreplace) /etc/yum.repos.d/almalinux-ha.repo %config(noreplace) /etc/yum.repos.d/almalinux-powertools.repo %config(noreplace) /etc/yum.repos.d/almalinux-resilientstorage.repo -%config(noreplace) /etc/yum.repos.d/almalinux-plus.repo %ifarch x86_64 %config(noreplace) /etc/yum.repos.d/almalinux-rt.repo %config(noreplace) /etc/yum.repos.d/almalinux-nfv.repo @@ -197,8 +199,8 @@ rm -rf %{buildroot} %{_prefix}/lib/systemd/system-preset/* %changelog -* Tue May 10 2022 Andrew Lukoshko - 8.6-0.1 -- 8.6 stable release +* Fri Oct 07 2022 Andrew Lukoshko - 8.7-0.2 +- 8.7 beta release * Thu Mar 31 2022 Andrew Lukoshko - 8.6-0.0 - 8.6 beta release diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo index 8fc75cf..c3069e6 100644 --- a/almalinux-resilientstorage.repo +++ b/almalinux-resilientstorage.repo @@ -1,28 +1,27 @@ # almalinux-resilientstorage.repo [resilientstorage] -name=AlmaLinux $releasever - ResilientStorage -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage -# baseurl=https://repo.almalinux.org/almalinux/$releasever/ResilientStorage/$basearch/os/ +name=AlmaLinux 8.7-beta - Resilient Storage +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage +# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/ResilientStorage/$basearch/os/ enabled=0 gpgcheck=1 -countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Sources [resilientstorage-source] -name=AlmaLinux $releasever - ResilientStorage Source -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-source -# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/Source/ +name=AlmaLinux 8.7-beta - Resilient Storage Sources +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage-source +# baseurl=https://repo.almalinux.org/vault/8.7-beta/ResilientStorage/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Debuginfo [resilientstorage-debuginfo] -name=AlmaLinux $releasever - ResilientStorage debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-debuginfo -# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/ +name=AlmaLinux 8.7-beta - Resilient Storage Debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/resilientstorage-debuginfo +# baseurl=https://repo.almalinux.org/vault/8.7-beta/ResilientStorage/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux diff --git a/almalinux-rt.repo b/almalinux-rt.repo index c0118a9..12dc65b 100644 --- a/almalinux-rt.repo +++ b/almalinux-rt.repo @@ -1,27 +1,27 @@ # almalinux-rt.repo [rt] -name=AlmaLinux $releasever - Real Time -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt -# baseurl=https://repo.almalinux.org/almalinux/$releasever/RT/$basearch/os/ +name=AlmaLinux 8.7-beta - Real Time +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt +# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/RT/$basearch/os/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Sources [rt-source] -name=AlmaLinux $releasever - Real Time Sources -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-source -# baseurl=https://repo.almalinux.org/vault/$releasever/RT/Source/ +name=AlmaLinux 8.7-beta - Real Time Sources +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt-source +# baseurl=https://repo.almalinux.org/vault/8.7-beta/RT/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Debuginfo [rt-debuginfo] -name=AlmaLinux $releasever - Real Time Debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-debuginfo -# baseurl=https://repo.almalinux.org/vault/$releasever/RT/debug/$basearch/ +name=AlmaLinux 8.7-beta - Real Time Debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/rt-debuginfo +# baseurl=https://repo.almalinux.org/vault/8.7-beta/RT/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux diff --git a/almalinux.repo b/almalinux.repo index a7b5d7a..4656e3f 100644 --- a/almalinux.repo +++ b/almalinux.repo @@ -1,78 +1,75 @@ # almalinux.repo [baseos] -name=AlmaLinux $releasever - BaseOS -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos -# baseurl=https://repo.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/ +name=AlmaLinux 8.7-beta - BaseOS +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos +# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/BaseOS/$basearch/os/ enabled=1 gpgcheck=1 -countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux [appstream] -name=AlmaLinux $releasever - AppStream -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream -# baseurl=https://repo.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/ +name=AlmaLinux 8.7-beta - AppStream +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream +# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/AppStream/$basearch/os/ enabled=1 gpgcheck=1 -countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux [extras] -name=AlmaLinux $releasever - Extras -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras -# baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/ +name=AlmaLinux 8.7-beta - Extras +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras +# baseurl=https://repo.almalinux.org/almalinux/8.7-beta/extras/$basearch/os/ enabled=1 gpgcheck=1 -countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Sources [baseos-source] -name=AlmaLinux $releasever - BaseOS Source -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-source -# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/Source/ +name=AlmaLinux 8.7-beta - BaseOS Sources +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos-source +# baseurl=https://repo.almalinux.org/vault/8.7-beta/BaseOS/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux [appstream-source] -name=AlmaLinux $releasever - AppStream Source -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-source -# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/Source/ +name=AlmaLinux 8.7-beta - AppStream Sources +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream-source +# baseurl=https://repo.almalinux.org/vault/8.7-beta/AppStream/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux [extras-source] -name=AlmaLinux $releasever - Extras Source -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-source -# baseurl=https://repo.almalinux.org/vault/$releasever/extras/Source/ +name=AlmaLinux 8.7-beta - Extras Sources +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras-source +# baseurl=https://repo.almalinux.org/vault/8.7-beta/extras/Source/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux ## Debuginfo [baseos-debuginfo] -name=AlmaLinux $releasever - BaseOS debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debuginfo -# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/ +name=AlmaLinux 8.7-beta - BaseOS Debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/baseos-debuginfo +# baseurl=https://repo.almalinux.org/vault/8.7-beta/BaseOS/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux [appstream-debuginfo] -name=AlmaLinux $releasever - AppStream debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debuginfo -# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/debug/$basearch/ +name=AlmaLinux 8.7-beta - AppStream Debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/appstream-debuginfo +# baseurl=https://repo.almalinux.org/vault/8.7-beta/AppStream/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux [extras-debuginfo] -name=AlmaLinux $releasever - Extras debuginfo -mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debuginfo -# baseurl=https://repo.almalinux.org/vault/$releasever/extras/debug/$basearch/ +name=AlmaLinux 8.7-beta - Extras Debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.7-beta/extras-debuginfo +# baseurl=https://repo.almalinux.org/vault/8.7-beta/extras/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux