From 69da959fd892b0e5f984a2be1b17859aa6cd996d Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 28 Dec 2021 10:21:39 +0000 Subject: [PATCH] 8.5 beta for PPC --- 90-default.preset | 21 +++++++++++++ almalinux-ha.repo | 18 +++++------ almalinux-powertools.repo | 18 +++++------ almalinux-release.spec | 25 ++++++++++----- almalinux-resilientstorage.repo | 27 +++++++++++++++++ almalinux.repo | 54 ++++++++++++++++----------------- 6 files changed, 110 insertions(+), 53 deletions(-) create mode 100644 almalinux-resilientstorage.repo diff --git a/90-default.preset b/90-default.preset index 318d705..d242391 100644 --- a/90-default.preset +++ b/90-default.preset @@ -173,3 +173,24 @@ enable nfs-convert.service # ignored by non-OSTree based systems # https://bugzilla.redhat.com/show_bug.cgi?id=1848453 enable ostree-remount.service + +# enable greenboot services +# https://bugzilla.redhat.com/show_bug.cgi?id=1935177 +enable greenboot-grub2-set-counter.service +enable greenboot-grub2-set-success.service +enable greenboot-healthcheck.service +enable greenboot-rpm-ostree-grub2-check-fallback.service +enable greenboot-status.service +enable greenboot-task-runner.service +enable redboot-auto-reboot.service +enable redboot-task-runner.service + +# enable dbus services +# https://bugzilla.redhat.com/show_bug.cgi?id=1941642 +# https://projects.engineering.redhat.com/browse/RHELBLD-6131 +enable dbus.socket +enable dbus-daemon.service + +# enable nfs-client.target +# https://bugzilla.redhat.com/show_bug.cgi?id=1967515 +enable nfs-client.target diff --git a/almalinux-ha.repo b/almalinux-ha.repo index fd8e5ff..9ebdcf5 100644 --- a/almalinux-ha.repo +++ b/almalinux-ha.repo @@ -1,27 +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.5-beta - HighAvailability +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/ha +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/HighAvailability/$basearch/os/ enabled=0 gpgcheck=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/almalinux/$releasever/HighAvailability/Source/ +name=AlmaLinux 8.5-beta - HighAvailability Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/ha-source +# baseurl=https://repo.almalinux.org/almalinux/8.5-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/almalinux/$releasever/HighAvailability/debug/$basearch/ +name=AlmaLinux 8.5-beta - HighAvailability debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/ha-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/HighAvailability/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 0159596..261a20c 100644 --- a/almalinux-powertools.repo +++ b/almalinux-powertools.repo @@ -1,27 +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.5-beta - PowerTools +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/powertools +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/PowerTools/$basearch/os/ enabled=0 gpgcheck=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/almalinux/$releasever/PowerTools/Source/ +name=AlmaLinux 8.5-beta - PowerTools Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/powertools-source +# baseurl=https://repo.almalinux.org/almalinux/8.5-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/almalinux/$releasever/PowerTools/debug/$basearch/ +name=AlmaLinux 8.5-beta - PowerTools debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/powertools-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/8.5-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 0ee359b..5ba2165 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -2,18 +2,18 @@ %define product_family AlmaLinux %define variant_titlecase Server %define variant_lowercase server -%define release_name Electric Cheetah +%define release_name Arctic Sphynx %define contentdir almalinux %define infra_var stock %define base_release_version 8 -%define full_release_version 8.4 +%define full_release_version 8.5 %define dist_release_version 8 -%define upstream_rel_long 8.4-0.6 -%define upstream_rel 8.4 -%define almalinux_rel 3 +%define upstream_rel_long 8.5-0.7 +%define upstream_rel 8.5 +%define almalinux_rel 1.1 %define dist .el%{dist_release_version} -# define beta Beta +%define beta Beta # The anaconda scripts in %%{_libexecdir} can create false requirements %global __requires_exclude_from %{_libexecdir} @@ -51,6 +51,7 @@ Source201: GPL Source300: almalinux.repo Source301: almalinux-ha.repo Source302: almalinux-powertools.repo +Source303: almalinux-resilientstorage.repo %description %{product_family} release files @@ -85,7 +86,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" -CPE_NAME="cpe:/o:almalinux:almalinux:%{full_release_version}:%{?beta:%(echo %{beta} | tr [A-Z] [a-z])}%{?!beta:GA}" +CPE_NAME="cpe:/o:almalinux:almalinux:%{base_release_version}::baseos" HOME_URL="https://almalinux.org/" DOCUMENTATION_URL="https://wiki.almalinux.org/" BUG_REPORT_URL="https://bugs.almalinux.org/" @@ -99,7 +100,7 @@ EOF 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 +echo "cpe:/o:almalinux:almalinux:%{base_release_version}::baseos" | tr [A-Z] [a-z] > %{buildroot}/etc/system-release-cpe # create /etc/issue and /etc/issue.net echo '\S' > %{buildroot}/etc/issue @@ -116,6 +117,7 @@ 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 mkdir -p -m 755 %{buildroot}/etc/dnf/vars echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra @@ -168,6 +170,7 @@ rm -rf %{buildroot} %config(noreplace) /etc/yum.repos.d/almalinux.repo %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/os-release %config /etc/system-release-cpe %config(noreplace) /etc/issue @@ -181,6 +184,12 @@ rm -rf %{buildroot} %{_prefix}/lib/systemd/system-preset/* %changelog +* Tue Dec 28 2021 Andrew Lukoshko - 8.5-1.1 +- Add RS repo + +* Thu Oct 07 2021 Andrew Lukoshko - 8.5-1 +- 8.5 beta release + * Thu Jul 29 2021 Andrew Lukoshko - 8.4-3 - disable fastestmirror dnf plugin for all repos diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo new file mode 100644 index 0000000..40ebe3f --- /dev/null +++ b/almalinux-resilientstorage.repo @@ -0,0 +1,27 @@ +# almalinux-resilientstorage.repo + +[resilientstorage] +name=AlmaLinux 8.5-beta - ResilientStorage +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/resilientstorage +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/ResilientStorage/$basearch/os/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux + +## Sources +[resilientstorage-source] +name=AlmaLinux 8.5-beta - ResilientStorage Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/resilientstorage-source +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/ResilientStorage/Source/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux + +## Debuginfo +[resilientstorage-debuginfo] +name=AlmaLinux 8.5-beta - ResilientStorage debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/resilientstorage-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/ResilientStorage/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 0b18f38..46667ad 100644 --- a/almalinux.repo +++ b/almalinux.repo @@ -1,75 +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.5-beta - BaseOS +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/baseos +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/BaseOS/$basearch/os/ enabled=1 gpgcheck=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.5-beta - AppStream +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/appstream +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/AppStream/$basearch/os/ enabled=1 gpgcheck=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.5-beta - Extras +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/extras +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/extras/$basearch/os/ enabled=1 gpgcheck=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/almalinux/$releasever/BaseOS/Source/ +name=AlmaLinux 8.5-beta - BaseOS Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/baseos-source +# baseurl=https://repo.almalinux.org/almalinux/8.5-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/almalinux/$releasever/AppStream/Source/ +name=AlmaLinux 8.5-beta - AppStream Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/appstream-source +# baseurl=https://repo.almalinux.org/almalinux/8.5-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/almalinux/$releasever/extras/Source/ +name=AlmaLinux 8.5-beta - Extras Source +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/extras-source +# baseurl=https://repo.almalinux.org/almalinux/8.5-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/almalinux/$releasever/BaseOS/debug/$basearch/ +name=AlmaLinux 8.5-beta - BaseOS debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/baseos-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/8.5-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/almalinux/$releasever/AppStream/debug/$basearch/ +name=AlmaLinux 8.5-beta - AppStream debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/appstream-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/8.5-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/almalinux/$releasever/extras/debug/$basearch/ +name=AlmaLinux 8.5-beta - Extras debuginfo +mirrorlist=https://mirrors.almalinux.org/mirrorlist/8.5-beta/extras-debuginfo +# baseurl=https://repo.almalinux.org/almalinux/8.5-beta/extras/debug/$basearch/ enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux