Merge branch 'a9' into a9-rhel

3 months ago · 4c9fe7b5e5
parent b403d96416 68979167fc
commit 4c9fe7b5e5
17 changed files with 406 additions and 266 deletions
--- a/90-default-user.preset
+++ b/90-default-user.preset
@ -17,5 +17,6 @@ enable pipewire-pulse.socket

 # https://bugzilla.redhat.com/show_bug.cgi?id=1976006
 enable pipewire-media-session.service
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=2022717
 enable wireplumber.service
--- a/90-default.preset
+++ b/90-default.preset
@ -197,7 +197,11 @@ enable dbus-broker.service
 enable iscsi.service
 enable iscsid.socket
 enable iscsiuio.socket
-enable iscsi-onboot.service 
+enable iscsi-onboot.service
+
+# Enable logrotate.timer
+# https://bugzilla.redhat.com/show_bug.cgi?id=1977865
+enable logrotate.timer 

 # Enable greenboot
 # https://bugzilla.redhat.com/show_bug.cgi?id=2005552
@ -209,6 +213,14 @@ enable greenboot-status.service
 enable greenboot-task-runner.service
 enable redboot-auto-reboot.service
 enable redboot-task-runner.service
+# https://bugzilla.redhat.com/show_bug.cgi?id=2108625
+enable greenboot-service-monitor.service

 # https://bugzilla.redhat.com/show_bug.cgi?id=2013299
 enable low-memory-monitor.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=2049627
+enable switcheroo-control.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=2106811
+enable clevis-luks-askpass.path
--- a/6
+++ b/6
@ -1,10 +1,8 @@
-AlmaLinux 8 EULA
+AlmaLinux 9 EULA

-AlmaLinux 8 comes with no guarantees or warranties of any sorts, 
+AlmaLinux 9 comes with no guarantees or warranties of any sorts, 
 either written or implied.

 The Distribution is released as GPLv2. Individual packages in the
 distribution come with their own licences. A copy of the GPLv2 license
 is included with the distribution media.
-
-
--- a/almalinux-addons.repo
+++ b/almalinux-addons.repo
@ -1,154 +0,0 @@
-[highavailability]
-name=AlmaLinux 9.0-beta - HighAvailability
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/highavailability
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/HighAvailability/$basearch/os/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=0
-
-[highavailability-debug]
-name=AlmaLinux 9.0-beta - HighAvailability - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/highavailability-debug
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/HighAvailability/debug/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[highavailability-source]
-name=AlmaLinux 9.0-beta - HighAvailability - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/highavailability-source
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/HighAvailability/Source/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[nfv]
-name=AlmaLinux 9.0-beta - NFV
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/nfv
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/NFV/$basearch/os/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=0
-
-[nfv-debug]
-name=AlmaLinux 9.0-beta - NFV - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/nfv-debug
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/NFV/debug/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[nfv-source]
-name=AlmaLinux 9.0-beta - NFV - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/nfv-source
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/NFV/Source/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[rt]
-name=AlmaLinux 9.0-beta - RT
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/rt
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/RT/$basearch/os/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=0
-
-[rt-debug]
-name=AlmaLinux 9.0-beta - RT - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/rt-debug
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/RT/debug/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[rt-source]
-name=AlmaLinux 9.0-beta - RT - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/rt-source
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/RT/Source/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[resilientstorage]
-name=AlmaLinux 9.0-beta - ResilientStorage
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/resilientstorage
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/ResilientStorage/$basearch/os/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=0
-
-[resilientstorage-debug]
-name=AlmaLinux 9.0-beta - ResilientStorage - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/resilientstorage-debug
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/ResilientStorage/debug/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[resilientstorage-source]
-name=AlmaLinux 9.0-beta - ResilientStorage - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/resilientstorage-source
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/ResilientStorage/Source/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[extras]
-name=AlmaLinux 9.0-beta - Extras packages
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/extras
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/extras/$basearch/os/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=1
-
-[extras-debug]
-name=AlmaLinux 9.0-beta - Extras packages - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/extras-debug
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/extras/debug/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[extras-source]
-name=AlmaLinux 9.0-beta - Extras packages - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/extras-source
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/extras/Source/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
--- a/almalinux-appstream.repo
+++ b/almalinux-appstream.repo
@ -0,0 +1,30 @@
+[appstream]
+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
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=1
+
+[appstream-debug]
+name=AlmaLinux $releasever - AppStream - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/appstream-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/AppStream/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[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/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-baseos.repo
+++ b/almalinux-baseos.repo
@ -0,0 +1,30 @@
+[baseos]
+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
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=1
+
+[baseos-debug]
+name=AlmaLinux $releasever - BaseOS - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/baseos-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[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/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-crb.repo
+++ b/almalinux-crb.repo
@ -0,0 +1,30 @@
+[crb]
+name=AlmaLinux $releasever - CRB
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/CRB/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[crb-debug]
+name=AlmaLinux $releasever - CRB - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/CRB/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[crb-source]
+name=AlmaLinux $releasever - CRB - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/crb-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/CRB/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-extras.repo
+++ b/almalinux-extras.repo
@ -0,0 +1,30 @@
+[extras]
+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
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[extras-debug]
+name=AlmaLinux $releasever - Extras - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/extras/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[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/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-highavailability.repo
+++ b/almalinux-highavailability.repo
@ -0,0 +1,30 @@
+[highavailability]
+name=AlmaLinux $releasever - HighAvailability
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/highavailability
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[highavailability-debug]
+name=AlmaLinux $releasever - HighAvailability - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/highavailability-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[highavailability-source]
+name=AlmaLinux $releasever - HighAvailability - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/highavailability-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/HighAvailability/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-nfv.repo
+++ b/almalinux-nfv.repo
@ -0,0 +1,30 @@
+[nfv]
+name=AlmaLinux $releasever - NFV
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[nfv-debug]
+name=AlmaLinux $releasever - NFV - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[nfv-source]
+name=AlmaLinux $releasever - NFV - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/nfv-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/NFV/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-plus.repo
+++ b/almalinux-plus.repo
@ -0,0 +1,30 @@
+[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
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[plus-debug]
+name=AlmaLinux $releasever - Plus - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/plus/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[plus-source]
+name=AlmaLinux $releasever - Plus - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/plus-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/plus/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-release.spec
+++ b/almalinux-release.spec
@ -1,18 +1,16 @@
 %global distro  AlmaLinux
-%global release_name Emerald Puma
+%global release_name Lime Lynx
 %global major   9
-%global minor   0
-
-%global beta Beta
+%global minor   1

 Name:           almalinux-release
 Epoch:          2
 Version:        %{major}.%{minor}
-Release:        3%{?dist}
+Release:        1.9%{?dist}
 Summary:        %{distro} release files
 License:        GPLv2
 URL:            https://almalinux.org
-# BuildArch:      noarch
+
 Provides:       centos-release = %{epoch}:%{version}-%{release}

 # Required for a lorax run (to generate install media)
@ -49,8 +47,18 @@ Source402:      clsecureboot001.cer
 # Fwupd signing certificate
 Source403:      clsecureboot001.cer

-Source500:      almalinux.repo
-Source501:      almalinux-addons.repo
+Source500:      almalinux-appstream.repo
+Source501:      almalinux-baseos.repo
+Source502:      almalinux-crb.repo
+Source503:      almalinux-extras.repo
+Source504:      almalinux-highavailability.repo
+Source505:      almalinux-resilientstorage.repo
+Source506:      almalinux-sap.repo
+Source507:      almalinux-saphana.repo
+Source508:      almalinux-plus.repo
+# Only for x86_64
+Source510:      almalinux-nfv.repo
+Source511:      almalinux-rt.repo

 Source600:      RPM-GPG-KEY-AlmaLinux-9

@ -107,12 +115,13 @@ ANSI_COLOR="0;34"
 LOGO="fedora-logo-icon"
 CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos"
 HOME_URL="https://almalinux.org/"
+DOCUMENTATION_URL="https://wiki.almalinux.org/"
 BUG_REPORT_URL="https://bugs.almalinux.org/"
-REDHAT_SUPPORT_PRODUCT="%{distro}"
-REDHAT_SUPPORT_PRODUCT_VERSION="%{major}.%{minor}%{?beta: %{beta}}"
+
 ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{major}"
 ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}.%{minor}"
-
+REDHAT_SUPPORT_PRODUCT="%{distro}"
+REDHAT_SUPPORT_PRODUCT_VERSION="%{major}.%{minor}%{?beta: %{beta}}"
 EOF

 # Create the symlink for /etc/os-release
@ -134,6 +143,8 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF
 # dist macros.

 %%__bootstrap ~bootstrap
+%%almalinux_ver %{major}
+%%almalinux %{major}
 %%centos_ver %{major}
 %%centos %{major}
 %%rhel %{major}
@ -215,10 +226,22 @@ ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.c
 install -d -m 0755 %{buildroot}%{_sysconfdir}/yum.repos.d
 install -p -m 0644 %{SOURCE500} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE501} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE502} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE503} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE504} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE505} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE506} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE507} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE508} %{buildroot}%{_sysconfdir}/yum.repos.d/
+# RT and NFV are only for x86_64
+%ifarch x86_64
+install -p -m 0644 %{SOURCE510} %{buildroot}%{_sysconfdir}/yum.repos.d/
+install -p -m 0644 %{SOURCE511} %{buildroot}%{_sysconfdir}/yum.repos.d/
+%endif

 # dnf variables
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
-# echo "%{major}-stream" > %{buildroot}%{_sysconfdir}/dnf/vars/stream
+echo "%{major}-stream" > %{buildroot}%{_sysconfdir}/dnf/vars/stream

 # copy GPG keys
 install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
@ -254,15 +277,37 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 %{_datadir}/pki/sb-certs/*.cer

 %files -n almalinux-repos
-%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-addons.repo
-# %config(noreplace) %{_sysconfdir}/dnf/vars/stream
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-appstream.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-baseos.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-crb.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-extras.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-highavailability.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-resilientstorage.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-sap.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-saphana.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-plus.repo
+%ifarch x86_64
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-nfv.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-rt.repo
+%endif
+%config(noreplace) %{_sysconfdir}/dnf/vars/stream

 %files -n almalinux-gpg-keys
 %{_sysconfdir}/pki/rpm-gpg


 %changelog
+* Tue Nov 15 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.1-1.9
+- 9.1 stable
+
+* Wed Jun 22 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.0-4
+- Fix AlmaLinux version in EULA
+
+* Mon May 23 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.0-3
+- 9.0 stable
+- Split repo files
+- Add SAP and SAPHANA repos
+
 * Thu Apr 21 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 9.0-2
 - Update repo URLs
 - Remove centos-stream-release from provides
--- a/almalinux-resilientstorage.repo
+++ b/almalinux-resilientstorage.repo
@ -0,0 +1,30 @@
+[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
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[resilientstorage-debug]
+name=AlmaLinux $releasever - ResilientStorage - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/resilientstorage-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[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/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-rt.repo
+++ b/almalinux-rt.repo
@ -0,0 +1,30 @@
+[rt]
+name=AlmaLinux $releasever - RT
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/RT/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[rt-debug]
+name=AlmaLinux $releasever - RT - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/RT/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[rt-source]
+name=AlmaLinux $releasever - RT - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/rt-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/RT/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-sap.repo
+++ b/almalinux-sap.repo
@ -0,0 +1,30 @@
+[sap]
+name=AlmaLinux $releasever - SAP
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/SAP/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[sap-debug]
+name=AlmaLinux $releasever - SAP - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/SAP/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[sap-source]
+name=AlmaLinux $releasever - SAP - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/sap-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/SAP/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux-saphana.repo
+++ b/almalinux-saphana.repo
@ -0,0 +1,30 @@
+[saphana]
+name=AlmaLinux $releasever - SAPHANA
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana
+# baseurl=https://repo.almalinux.org/almalinux/$releasever/SAPHANA/$basearch/os/
+enabled=0
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[saphana-debug]
+name=AlmaLinux $releasever - SAPHANA - Debug
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-debug
+# baseurl=https://repo.almalinux.org/vault/$releasever/SAPHANA/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
+
+[saphana-source]
+name=AlmaLinux $releasever - SAPHANA - Source
+mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/saphana-source
+# baseurl=https://repo.almalinux.org/vault/$releasever/SAPHANA/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
+metadata_expire=86400
+enabled_metadata=0
--- a/almalinux.repo
+++ b/almalinux.repo
@ -1,92 +0,0 @@
-[baseos]
-name=AlmaLinux 9.0-beta - BaseOS
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/baseos
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/BaseOS/$basearch/os/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=1
-
-[baseos-debug]
-name=AlmaLinux 9.0-beta - BaseOS - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/baseos-debug
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/BaseOS/debug/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[baseos-source]
-name=AlmaLinux 9.0-beta - BaseOS - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/baseos-source
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/BaseOS/Source/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[appstream]
-name=AlmaLinux 9.0-beta - AppStream
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/appstream
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/AppStream/$basearch/os/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=1
-
-[appstream-debug]
-name=AlmaLinux 9.0-beta - AppStream - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/appstream-debug
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/AppStream/debug/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[appstream-source]
-name=AlmaLinux 9.0-beta - AppStream - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/appstream-source
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/AppStream/Source/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[crb]
-name=AlmaLinux 9.0-beta - CRB
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/crb
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/CRB/$basearch/os/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=0
-
-[crb-debug]
-name=AlmaLinux 9.0-beta - CRB - Debug
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/crb-debug
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/CRB/debug/$basearch/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0
-
-[crb-source]
-name=AlmaLinux 9.0-beta - CRB - Source
-mirrorlist=https://mirrors.almalinux.org/mirrorlist/9.0-beta/crb-source
-# baseurl=https://repo.almalinux.org/almalinux/9.0-beta/CRB/Source/
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-enabled=0