Merge pull request 'Enable CRB repository by default' (#1) from ngompa/almalinux-kitten-release-rpm:a10s-enable-crb into a10s

Reviewed-on: #1

90-default-user.preset

@@ -28,3 +28,8 @@ enable snapd.session-agent.socket
 enable obex.service
 enable grub-boot-success.timer
 enable pulseaudio.socket
+
+# Ensure xdg-user-dirs are created properly
+# https://issues.redhat.com/browse/RHEL-79119
+# https://issues.redhat.com/browse/RHEL-80010
+enable xdg-user-dirs.service

90-default.preset

@@ -361,6 +361,10 @@ enable device_cio_free.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=1630514
 enable stratisd.service
 
+# nvme auto connect
+# RHEL-76850
+enable nvmefc-boot-connections.service
+
 # Enable a service to finalize staged OSTree changes at shutdown
 # https://bugzilla.redhat.com/show_bug.cgi?id=1639372
 enable ostree-finalize-staged.path
@@ -420,9 +424,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
@@ -467,3 +471,5 @@ enable cockpit.socket
 # https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
 enable fwupd-refresh.timer
 
+# RHEL-67012
+enable fips-crypto-policy-overlay.service

almalinux-crb.repo

@@ -2,7 +2,7 @@
 name=AlmaLinux Kitten $releasever - CRB
 mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/crb
 # baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/CRB/$basearch/os/
-enabled=0
+enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10

almalinux-kitten-release.spec

@@ -6,9 +6,12 @@
 %global minor   0
 # %%global eol_date 2035-06-01
 
+# For rpmbuild-bumpspec
+%global baserelease 2
+
 Name:           almalinux-kitten-release
 Version:        %{major}.%{minor}
-Release:        0.21%{?dist}
+Release:        8%{?dist}.0.%{baserelease}
 Summary:        %{distro} release files
 License:        GPL-2.0-or-later
 URL:            https://almalinux.org
@@ -34,6 +37,9 @@ Provides:       redhat-release = %{version}-%{release}
 # https://github.com/rpm-software-management/dnf/blob/4.2.23/dnf/const.py.in#L26
 Provides:       system-release = %{version}-%{release}
 Provides:       system-release(releasever) = %{major}
+# only have releasever_major, do not add releasever_minor
+# https://issues.redhat.com/browse/RHEL-68034
+Provides:       system-release(releasever_major) = %{major}
 Conflicts:      system-release
 
 # required by libdnf
@@ -49,16 +55,16 @@ Source302:      90-default-user.preset
 Source303:      99-default-disable.preset
 Source304:      50-redhat.conf
 
-Source400:      alsecureboot001.cer
+Source400:      alsecurebootca1.cer
+Source401:      alsecureboot1.cer
 
 Source500:      almalinux-appstream.repo
 Source501:      almalinux-baseos.repo
 Source502:      almalinux-crb.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
@@ -154,7 +160,7 @@ 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}"
 
@@ -175,7 +181,7 @@ echo "cpe:/o:almalinux:almalinux:%{major}::baseos" > %{buildroot}%{_sysconfdir}/
 
 # create /etc/issue, /etc/issue.net and /etc/issue.d
 echo '\S' > %{buildroot}%{_sysconfdir}/issue
-echo 'Kernel \r on an \m' >> %{buildroot}%{_sysconfdir}/issue
+echo 'Kernel \r on \m' >> %{buildroot}%{_sysconfdir}/issue
 cp %{buildroot}%{_sysconfdir}/issue{,.net}
 echo >> %{buildroot}%{_sysconfdir}/issue
 mkdir -p %{buildroot}%{_sysconfdir}/issue.d
@@ -230,30 +236,30 @@ install -d -m 0755 %{buildroot}%{_datadir}/pki/sb-certs/
 
 # Install aarch64 certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-aarch64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-aarch64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-aarch64.cer
 
 
 # Install x86_64 certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-x86_64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-x86_64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-x86_64.cer
 
 # Install ppc64le certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-ppc64le.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-ppc64le.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-ppc64le.cer
 
 # Install s390x certs
 install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-s390x.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer
-install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-s390x.cer
-
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer
+install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-uki-virt-s390x.cer
+# Install
 # Link x86_64 certs
 ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-x86_64.cer
 ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-x86_64.cer
@@ -288,7 +294,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/
@@ -302,6 +307,7 @@ install -p -m 0644 %{SOURCE512} %{buildroot}%{_sysconfdir}/yum.repos.d/
 # 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
@@ -357,7 +363,6 @@ echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-crb.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
@@ -374,6 +379,36 @@ echo '%%x86_64_v2 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.x86_64_v2
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Thu May 29 2025 Neal Gompa <ngompa@almalinux.org> - 10.0-8.0.2
+- Enable CRB repository by default
+
+* Mon Mar 31 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-8.0.1
+- Update SB keys
+
+* Thu Mar 13 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-8
+- Enable xdg-user-dirs service to fix creation races
+
+* Fri Feb 21 2025 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-7
+- Enable nvmefc-boot-connections.service
+- Tweak /etc/issue to avoid incorrect English
+- Provide system-release(releasever_major)
+
+* Thu Feb 06 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 10.0-3.0.2
+- Update AlmaLinux Secure Boot certificate
+
+* 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

almalinux-resilientstorage.repo

@@ -1,30 +0,0 @@
-[resilientstorage]
-name=AlmaLinux Kitten $releasever - ResilientStorage
-mirrorlist=https://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/resilientstorage
-# baseurl=https://kitten.repo.almalinux.org/$releasever-kitten/ResilientStorage/$basearch/os/
-enabled=0
-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://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/resilientstorage-debug
-# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/ResilientStorage/debug/$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://kitten.mirrors.almalinux.org/mirrorlist/$releasever-kitten/resilientstorage-source
-# baseurl=https://kitten.vault.almalinux.org/$releasever-kitten/ResilientStorage/Source/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-10
-metadata_expire=86400
-enabled_metadata=0