Remove ResilientStorage repo

- enable fips-crypto-policy-overlay.service

90-default.preset

@@ -232,6 +232,7 @@ enable abrt-xorg.service
 enable abrt-vmcore.service
 
 # Locally-running services
+enable kdump.service
 enable ksm.service
 enable ksmtuned.service
 enable rootfs-resize.service
@@ -419,9 +420,9 @@ enable thermald.service
 # https://pagure.io/fesco/issue/2457
 enable uresourced.service
 
-# enable power-profiles-daemon
-# https://pagure.io/fedora-workstation/issue/191
-enable power-profiles-daemon.service
+# enable tuned-ppd.service
+# https://issues.redhat.com/browse/RHEL-68853
+enable tuned-ppd.service
 
 # Enable clevis-luks-askpass.path
 # https://bugzilla.redhat.com/show_bug.cgi?id=2101719
@@ -465,3 +466,6 @@ enable cockpit.socket
 
 # https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
 enable fwupd-refresh.timer
+
+# RHEL-67012
+enable fips-crypto-policy-overlay.service

almalinux-appstream.repo

@@ -1,8 +1,7 @@
 [appstream]
 name=AlmaLinux Kitten $releasever - AppStream
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/appstream
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/AppStream/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-appstream-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/appstream
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/AppStream/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [appstream-debuginfo]
 name=AlmaLinux Kitten $releasever - AppStream - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/appstream-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/AppStream/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-appstream-debuginfo-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/appstream-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/AppStream/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [appstream-source]
 name=AlmaLinux Kitten $releasever - AppStream - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/appstream-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/AppStream/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-baseos-src/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/appstream-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/AppStream/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-baseos.repo

@@ -1,8 +1,7 @@
 [baseos]
 name=AlmaLinux Kitten $releasever - BaseOS
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/baseos
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/BaseOS/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-baseos-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/baseos
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/BaseOS/$basearch/os/
 enabled=1
 gpgcheck=1
 countme=1
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [baseos-debuginfo]
 name=AlmaLinux Kitten $releasever - BaseOS - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/baseos-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/BaseOS/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-baseos-debuginfo-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/baseos-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/BaseOS/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [baseos-source]
 name=AlmaLinux Kitten $releasever - BaseOS - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/baseos-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/BaseOS/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-baseos-src/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/baseos-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/BaseOS/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-crb.repo

@@ -1,9 +1,8 @@
 [crb]
 name=AlmaLinux Kitten $releasever - CRB
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/crb
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/CRB/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-crb-$basearch/
-enabled=1
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/crb
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/CRB/$basearch/os/
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [crb-debuginfo]
 name=AlmaLinux Kitten $releasever - CRB - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/crb-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/CRB/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-crb-debuginfo-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/crb-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/CRB/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [crb-source]
 name=AlmaLinux Kitten $releasever - CRB - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/crb-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/CRB/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-crb-src/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/crb-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/CRB/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-extras-common.repo

@@ -0,0 +1,30 @@
+[extras-common]
+name=AlmaLinux Kitten $releasever - Extras packages
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras-common
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/extras-common/$basearch/os/
+enabled=1
+gpgcheck=1
+countme=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
+metadata_expire=86400
+enabled_metadata=1
+
+[extras-common-debuginfo]
+name=AlmaLinux Kitten $releasever - Extras packages - Debug
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras-common-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/extras-common/debug/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
+metadata_expire=86400
+enabled_metadata=0
+
+[extras-common-source]
+name=AlmaLinux Kitten $releasever - Extras packages - Source
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/extras-common-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/extras-common/Source/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
+metadata_expire=86400
+enabled_metadata=0

almalinux-extras.repo

@@ -1,33 +0,0 @@
-[extras]
-name=AlmaLinux Kitten $releasever - Extras
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/extras
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/extras/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-extras-$basearch/
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=1
-
-[extras-debuginfo]
-name=AlmaLinux Kitten $releasever - Extras - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/extras-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/extras/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-extras-debuginfo-$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=0
-
-[extras-source]
-name=AlmaLinux Kitten $releasever - Extras - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/extras-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/extras/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-extras-src/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=0

almalinux-highavailability.repo

@@ -1,9 +1,8 @@
 [highavailability]
 name=AlmaLinux Kitten $releasever - HighAvailability
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/highavailability
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/HighAvailability/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-highavailability-$basearch/
-enabled=1
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/highavailability
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/HighAvailability/$basearch/os/
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [highavailability-debuginfo]
 name=AlmaLinux Kitten $releasever - HighAvailability - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/highavailability-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/HighAvailability/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-highavailability-debuginfo-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/highavailability-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/HighAvailability/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [highavailability-source]
 name=AlmaLinux Kitten $releasever - HighAvailability - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/highavailability-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/HighAvailability/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-highavailability-src/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/highavailability-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/HighAvailability/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-kitten-release.spec

@@ -1,16 +1,14 @@
-# Should be deleted or changed to "%%bcond_with beta" before the release
-# Also baseurl for regular repos should be changed to repo.kitten.almalinux.org
-# and mirrorlist should be set as default
-%bcond_without beta
+%bcond_with beta
 
 %global distro  AlmaLinux Kitten
+%define release_name    Lion Cub
 %global major   10
 %global minor   0
 # %%global eol_date 2035-06-01
 
 Name:           almalinux-kitten-release
 Version:        %{major}.%{minor}
-Release:        0.18%{?dist}
+Release:        3%{?dist}.0.1
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -56,11 +54,10 @@ Source400:      alsecureboot001.cer
 Source500:      almalinux-appstream.repo
 Source501:      almalinux-baseos.repo
 Source502:      almalinux-crb.repo
-Source503:      almalinux-extras.repo
+Source503:      almalinux-extras-common.repo
 Source504:      almalinux-highavailability.repo
-Source505:      almalinux-resilientstorage.repo
-Source506:      almalinux-sap.repo
-Source507:      almalinux-saphana.repo
+Source505:      almalinux-sap.repo
+Source506:      almalinux-saphana.repo
 # Only for x86_64
 Source510:      almalinux-nfv.repo
 Source511:      almalinux-rt.repo
@@ -86,9 +83,13 @@ Provides: almalinux-sb-certs = %{version}-%{release}
 Summary:        %{distro} package repositories
 Requires:       almalinux-kitten-release = %{version}-%{release}
 Requires:       almalinux-gpg-keys = %{version}-%{release}
+# Required by CentOS SIGs release packages
+Provides:       centos-stream-repos = %{version}-%{release}
 
 %package -n almalinux-gpg-keys
 Summary:        %{distro} RPM keys
+# Required by CentOS SIGs release packages
+Provides:       centos-gpg-keys = %{version}-%{release}
 
 %description
 %{distro} release files.
@@ -109,7 +110,7 @@ cp %{SOURCE201} ./docs
 
 # create /etc/system-release and /etc/redhat-release
 install -d -m 0755 %{buildroot}%{_sysconfdir}
-echo "%{distro} release %{major}" > %{buildroot}%{_sysconfdir}/almalinux-release
+echo "%{distro} release %{major} (%{release_name})" > %{buildroot}%{_sysconfdir}/almalinux-release
 ln -s almalinux-release %{buildroot}%{_sysconfdir}/system-release
 ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 
@@ -141,18 +142,18 @@ ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 install -d -m 0755 %{buildroot}%{_prefix}/lib
 cat > %{buildroot}%{_prefix}/lib/os-release << EOF
 NAME="%{dist_name}"
-VERSION="%{major}"
+VERSION="%{major} (%{release_name})"
 ID="almalinux"
 ID_LIKE="rhel centos fedora"
 VERSION_ID="%{major}"
 PLATFORM_ID="platform:el%{major}"
-PRETTY_NAME="%{distro} %{major}"
+PRETTY_NAME="%{distro} %{major} (%{release_name})"
 ANSI_COLOR="0;34"
 LOGO="fedora-logo-icon"
 CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos"
 HOME_URL="%{dist_home_url}"
 DOCUMENTATION_URL="https://wiki.almalinux.org/"
-VENDOR_NAME="Almalinux"
+VENDOR_NAME="AlmaLinux"
 VENDOR_URL="%{dist_home_url}"
 BUG_REPORT_URL="%{dist_bug_report_url}"
 
@@ -286,7 +287,6 @@ 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/
 # RT and NFV are only for x86_64
 %ifarch x86_64
 install -p -m 0644 %{SOURCE510} %{buildroot}%{_sysconfdir}/yum.repos.d/
@@ -297,6 +297,12 @@ install -p -m 0644 %{SOURCE511} %{buildroot}%{_sysconfdir}/yum.repos.d/
 install -p -m 0644 %{SOURCE512} %{buildroot}%{_sysconfdir}/yum.repos.d/
 %endif
 
+# Replace basearch to x86_64_v2
+%ifarch x86_64_v2
+sed -i "s/\$basearch/x86_64_v2/g" %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
+sed -i '/^mirrorlist=/ s|$|?arch=x86_64_v2|g' %{buildroot}%{_sysconfdir}/yum.repos.d/*.repo
+%endif
+
 # dnf variables
 install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
 echo "%{major}-stream" > %{buildroot}%{_sysconfdir}/dnf/vars/stream
@@ -309,6 +315,7 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 %ifarch x86_64_v2
 echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
+echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %endif
 
 
@@ -347,9 +354,8 @@ echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildr
 %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-extras-common.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
 %ifarch x86_64
@@ -366,6 +372,38 @@ echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildr
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Tue Dec 24 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-3.0.1
+- Remove ResilientStorage repo
+
+* Tue Dec 17 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-3
+- Replace power-profiles-daemon with tuned-ppd
+- enable fips-crypto-policy-overlay.service
+
+* Tue Oct 22 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.21.2
+- Fix VENDOR_NAME in os-release
+
+* Fri Oct 18 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.21.1
+- Use arch parameter for x86_64_v2 architecture in mirrorlists
+
+* Wed Oct 09 2024 Andrew Lukoshko <alukoshko@almalinux.org> - 10.0-0.21
+- Rename extras to extras-common to follow CS
+- Enable kdump.service
+- Drop beta repos
+- Add Provides for compatibility with CentOS SIGs release packages
+
+* Mon Oct 07 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.19.1
+- Set mirrorlist as default
+- Update mirrorlist and baseurl for repos
+
+* Mon Sep 30 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.19
+- Set release name to Lion Cub
+
+* Thu Sep 19 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.18.2
+- Use x86_64_v2 instead of $basearch in repo files.
+
+* Tue Aug 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.18.1
+- Add x86_64_v2 macros
+
 * Tue Aug 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.18
 - Rename to almalinux-kitten
 - Update repo paths and names

almalinux-nfv.repo

@@ -1,9 +1,8 @@
 [nfv]
 name=AlmaLinux Kitten $releasever - NFV
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/nfv
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/NFV/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-nfv-$basearch/
-enabled=1
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nfv
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/NFV/$basearch/os/
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [nfv-debuginfo]
 name=AlmaLinux Kitten $releasever - NFV - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/nfv-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/NFV/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-nfv-debuginfo-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nfv-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/NFV/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [nfv-source]
 name=AlmaLinux Kitten $releasever - NFV - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/nfv-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/NFV/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-nfv-src/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/nfv-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/NFV/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-resilientstorage.repo

@@ -1,33 +0,0 @@
-[resilientstorage]
-name=AlmaLinux Kitten $releasever - ResilientStorage
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/resilientstorage
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/ResilientStorage/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-resilientstorage-$basearch/
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=1
-
-[resilientstorage-debuginfo]
-name=AlmaLinux Kitten $releasever - ResilientStorage - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/resilientstorage-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/ResilientStorage/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-resilientstorage-debuginfo-$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=0
-
-[resilientstorage-source]
-name=AlmaLinux Kitten $releasever - ResilientStorage - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/resilientstorage-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/ResilientStorage/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-resilientstorage-src/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=0

almalinux-rt.repo

@@ -1,9 +1,8 @@
 [rt]
 name=AlmaLinux Kitten $releasever - RT
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/rt
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/RT/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-rt-$basearch/
-enabled=1
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/rt
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/RT/$basearch/os/
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [rt-debuginfo]
 name=AlmaLinux Kitten $releasever - RT - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/rt-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/RT/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-rt-debuginfo-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/rt-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/RT/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [rt-source]
 name=AlmaLinux Kitten $releasever - RT - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/rt-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/RT/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-rt-src/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/rt-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/RT/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-sap.repo

@@ -1,9 +1,8 @@
 [sap]
 name=AlmaLinux Kitten $releasever - SAP
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/sap
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/SAP/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-sap-$basearch/
-enabled=1
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/sap
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/SAP/$basearch/os/
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [sap-debuginfo]
 name=AlmaLinux Kitten $releasever - SAP - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/sap-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/SAP/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-sap-debuginfo-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/sap-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/SAP/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [sap-source]
 name=AlmaLinux Kitten $releasever - SAP - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/sap-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/SAP/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-sap-src/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/sap-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/SAP/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-saphana.repo

@@ -1,9 +1,8 @@
 [saphana]
 name=AlmaLinux Kitten $releasever - SAPHANA
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/saphana
-# baseurl=https://repo.kitten.almalinux.org/almalinux/$releasever/SAPHANA/$basearch/os/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-saphana-$basearch/
-enabled=1
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/saphana
+# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/SAPHANA/$basearch/os/
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -12,9 +11,8 @@ enabled_metadata=1
 
 [saphana-debuginfo]
 name=AlmaLinux Kitten $releasever - SAPHANA - Debug
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/saphana-debug
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/SAPHANA/debug/$basearch/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-saphana-debuginfo-$basearch/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/saphana-debug
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/SAPHANA/debug/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
@@ -23,9 +21,8 @@ enabled_metadata=0
 
 [saphana-source]
 name=AlmaLinux Kitten $releasever - SAPHANA - Source
-# mirrorlist=https://mirrors.kitten.almalinux.org/mirrorlist/$releasever/saphana-source
-# baseurl=https://repo.kitten.almalinux.org/vault/$releasever/SAPHANA/Source/
-baseurl=https://build.almalinux.org/pulp/content/prod/almalinux-kitten-$releasever-saphana-src/
+mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/saphana-source
+# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/SAPHANA/Source/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10