Browse Source

Update for 8.5

pull/1/head 8.5-3
Andrew Lukoshko 9 months ago
parent
commit
dffabf7e10
  1. 21
      90-default.preset
  2. 27
      almalinux-plus.repo
  3. 31
      almalinux-release.spec
  4. 27
      almalinux-resilientstorage.repo

21
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

27
almalinux-plus.repo

@ -0,0 +1,27 @@
# almalinux-plus.repo
[plus]
name=AlmaLinux $releasever - Plus
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus
# baseurl=https://repo.almalinux.org/almalinux/$releasever/plus/$basearch/os/
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
## Sources
[plus-source]
name=AlmaLinux $releasever - Plus Source
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-source
# baseurl=https://repo.almalinux.org/almalinux/$releasever/plus/Source/
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
## Debuginfo
[plus-debuginfo]
name=AlmaLinux $releasever - Plus debuginfo
mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-debuginfo
# baseurl=https://repo.almalinux.org/almalinux/$releasever/plus/debug/$basearch/
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux

31
almalinux-release.spec

@ -2,19 +2,17 @@
%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 upstream_rel_long 8.5-0.8
%define upstream_rel 8.5
%define almalinux_rel 3
%define dist .el%{dist_release_version}
# define beta Beta
# The anaconda scripts in %%{_libexecdir} can create false requirements
%global __requires_exclude_from %{_libexecdir}
@ -51,6 +49,8 @@ Source201: GPL
Source300: almalinux.repo
Source301: almalinux-ha.repo
Source302: almalinux-powertools.repo
Source303: almalinux-resilientstorage.repo
Source304: almalinux-plus.repo
%description
%{product_family} release files
@ -85,7 +85,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 +99,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 +116,8 @@ 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
mkdir -p -m 755 %{buildroot}/etc/dnf/vars
echo "%{infra_var}" > %{buildroot}/etc/dnf/vars/infra
@ -167,7 +169,9 @@ rm -rf %{buildroot}
/etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
%config(noreplace) /etc/yum.repos.d/almalinux.repo
%config(noreplace) /etc/yum.repos.d/almalinux-ha.repo
%config(noreplace) /etc/yum.repos.d/almalinux-plus.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 +185,17 @@ rm -rf %{buildroot}
%{_prefix}/lib/systemd/system-preset/*
%changelog
* Fri Nov 12 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-3
- Fix ResilientStorage repo
* Tue Nov 09 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-2
- 8.5 stable release
- Add ResilientStorage repo
- Add Plus repo
* Thu Oct 07 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.5-1
- 8.5 beta release
* Thu Jul 29 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 8.4-3
- disable fastestmirror dnf plugin for all repos

27
almalinux-resilientstorage.repo

@ -0,0 +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/
enabled=0
gpgcheck=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/almalinux/$releasever/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/almalinux/$releasever/ResilientStorage/debug/$basearch/
enabled=0
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
Loading…
Cancel
Save