From bf8c8e55e3c24d8072aa772e697ea8a6b802656c Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 23 May 2022 22:43:13 +0200 Subject: [PATCH 1/9] Update for 9.0 stable - Split repo files - Add SAP and SAPHANA repos --- almalinux-addons.repo | 154 -------------------------------- almalinux-appstream.repo | 30 +++++++ almalinux-baseos.repo | 30 +++++++ almalinux-crb.repo | 30 +++++++ almalinux-extras.repo | 30 +++++++ almalinux-highavailability.repo | 30 +++++++ almalinux-nfv.repo | 30 +++++++ almalinux-release.spec | 36 ++++++-- almalinux-resilientstorage.repo | 30 +++++++ almalinux-rt.repo | 30 +++++++ almalinux-sap.repo | 30 +++++++ almalinux-saphana.repo | 30 +++++++ almalinux.repo | 92 ------------------- 13 files changed, 330 insertions(+), 252 deletions(-) delete mode 100644 almalinux-addons.repo create mode 100644 almalinux-appstream.repo create mode 100644 almalinux-baseos.repo create mode 100644 almalinux-crb.repo create mode 100644 almalinux-extras.repo create mode 100644 almalinux-highavailability.repo create mode 100644 almalinux-nfv.repo create mode 100644 almalinux-resilientstorage.repo create mode 100644 almalinux-rt.repo create mode 100644 almalinux-sap.repo create mode 100644 almalinux-saphana.repo delete mode 100644 almalinux.repo diff --git a/almalinux-addons.repo b/almalinux-addons.repo deleted file mode 100644 index 3bcb0f9..0000000 --- a/almalinux-addons.repo +++ /dev/null @@ -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 diff --git a/almalinux-appstream.repo b/almalinux-appstream.repo new file mode 100644 index 0000000..311ee69 --- /dev/null +++ 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 diff --git a/almalinux-baseos.repo b/almalinux-baseos.repo new file mode 100644 index 0000000..0e6d0c2 --- /dev/null +++ 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 diff --git a/almalinux-crb.repo b/almalinux-crb.repo new file mode 100644 index 0000000..706a3d0 --- /dev/null +++ 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=1 + +[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 diff --git a/almalinux-extras.repo b/almalinux-extras.repo new file mode 100644 index 0000000..3800cb0 --- /dev/null +++ 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=0 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 +metadata_expire=86400 +enabled_metadata=1 + +[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 diff --git a/almalinux-highavailability.repo b/almalinux-highavailability.repo new file mode 100644 index 0000000..c0a6132 --- /dev/null +++ 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=1 + +[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 diff --git a/almalinux-nfv.repo b/almalinux-nfv.repo new file mode 100644 index 0000000..b238d2a --- /dev/null +++ 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=1 + +[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 diff --git a/almalinux-release.spec b/almalinux-release.spec index 27ec925..502de11 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -3,15 +3,12 @@ %global major 9 %global minor 0 -%global beta Beta - Name: almalinux-release Version: %{major}.%{minor} -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://almalinux.org -# BuildArch: noarch Provides: centos-release = %{version}-%{release} @@ -49,8 +46,17 @@ 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 +# Only for x86_64 +Source508: almalinux-nfv.repo +Source509: almalinux-rt.repo Source600: RPM-GPG-KEY-AlmaLinux-9 @@ -134,6 +140,8 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF # dist macros. %%__bootstrap ~bootstrap +%%almalinux_ver %{major} +%%almalinux %{major} %%centos_ver %{major} %%centos %{major} %%rhel %{major} @@ -215,6 +223,17 @@ 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/ +# RT and NFV are only for x86_64 +%ifarch x86_64 +install -p -m 0644 %{SOURCE508} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE509} %{buildroot}%{_sysconfdir}/yum.repos.d/ +%endif # dnf variables install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars @@ -263,6 +282,11 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %changelog +* Mon May 23 2022 Andrew Lukoshko - 9.0-3 +- 9.0 stable +- Split repo files +- Add SAP and SAPHANA repos + * Thu Apr 21 2022 Andrew Lukoshko - 9.0-2 - Update repo URLs - Remove centos-stream-release from provides diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo new file mode 100644 index 0000000..54ca3fa --- /dev/null +++ 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=1 + +[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 diff --git a/almalinux-rt.repo b/almalinux-rt.repo new file mode 100644 index 0000000..ce387ff --- /dev/null +++ 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=1 + +[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 diff --git a/almalinux-sap.repo b/almalinux-sap.repo new file mode 100644 index 0000000..84ff90d --- /dev/null +++ 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=1 + +[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 diff --git a/almalinux-saphana.repo b/almalinux-saphana.repo new file mode 100644 index 0000000..6a157d1 --- /dev/null +++ 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=1 + +[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 diff --git a/almalinux.repo b/almalinux.repo deleted file mode 100644 index b561281..0000000 --- a/almalinux.repo +++ /dev/null @@ -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 From f1605df8b68e1df234326aa628dc6192348e8641 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Mon, 23 May 2022 23:02:16 +0200 Subject: [PATCH 2/9] Fix spec and update presets --- 90-default-user.preset | 1 + 90-default.preset | 9 ++++++++- almalinux-release.spec | 15 ++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/90-default-user.preset b/90-default-user.preset index d0095ff..be8a5d7 100644 --- 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 diff --git a/90-default.preset b/90-default.preset index d947ae6..e147857 100644 --- 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 @@ -212,3 +216,6 @@ enable redboot-task-runner.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 diff --git a/almalinux-release.spec b/almalinux-release.spec index 502de11..b67f293 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -273,9 +273,18 @@ 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 +%ifarch x86_64 +%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-nfv.repo +%config(noreplace) %{_sysconfdir}/yum.repos.d/almalinux-rt.repo +%endif %files -n almalinux-gpg-keys %{_sysconfdir}/pki/rpm-gpg From a0972f03876b0d0a0d0a39b1797fe19da12bc4f8 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 24 May 2022 01:38:00 +0200 Subject: [PATCH 3/9] Use enabled_metadata=1 only for BaseOS and AppStream --- almalinux-crb.repo | 2 +- almalinux-extras.repo | 2 +- almalinux-highavailability.repo | 2 +- almalinux-nfv.repo | 2 +- almalinux-resilientstorage.repo | 2 +- almalinux-rt.repo | 2 +- almalinux-sap.repo | 2 +- almalinux-saphana.repo | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/almalinux-crb.repo b/almalinux-crb.repo index 706a3d0..8186c7f 100644 --- a/almalinux-crb.repo +++ b/almalinux-crb.repo @@ -7,7 +7,7 @@ gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 metadata_expire=86400 -enabled_metadata=1 +enabled_metadata=0 [crb-debug] name=AlmaLinux $releasever - CRB - Debug diff --git a/almalinux-extras.repo b/almalinux-extras.repo index 3800cb0..ef34c31 100644 --- a/almalinux-extras.repo +++ b/almalinux-extras.repo @@ -7,7 +7,7 @@ gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 metadata_expire=86400 -enabled_metadata=1 +enabled_metadata=0 [extras-debug] name=AlmaLinux $releasever - Extras - Debug diff --git a/almalinux-highavailability.repo b/almalinux-highavailability.repo index c0a6132..d489012 100644 --- a/almalinux-highavailability.repo +++ b/almalinux-highavailability.repo @@ -7,7 +7,7 @@ gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 metadata_expire=86400 -enabled_metadata=1 +enabled_metadata=0 [highavailability-debug] name=AlmaLinux $releasever - HighAvailability - Debug diff --git a/almalinux-nfv.repo b/almalinux-nfv.repo index b238d2a..9c22693 100644 --- a/almalinux-nfv.repo +++ b/almalinux-nfv.repo @@ -7,7 +7,7 @@ gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 metadata_expire=86400 -enabled_metadata=1 +enabled_metadata=0 [nfv-debug] name=AlmaLinux $releasever - NFV - Debug diff --git a/almalinux-resilientstorage.repo b/almalinux-resilientstorage.repo index 54ca3fa..8cc965f 100644 --- a/almalinux-resilientstorage.repo +++ b/almalinux-resilientstorage.repo @@ -7,7 +7,7 @@ gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 metadata_expire=86400 -enabled_metadata=1 +enabled_metadata=0 [resilientstorage-debug] name=AlmaLinux $releasever - ResilientStorage - Debug diff --git a/almalinux-rt.repo b/almalinux-rt.repo index ce387ff..1a4b30e 100644 --- a/almalinux-rt.repo +++ b/almalinux-rt.repo @@ -7,7 +7,7 @@ gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 metadata_expire=86400 -enabled_metadata=1 +enabled_metadata=0 [rt-debug] name=AlmaLinux $releasever - RT - Debug diff --git a/almalinux-sap.repo b/almalinux-sap.repo index 84ff90d..06f84a7 100644 --- a/almalinux-sap.repo +++ b/almalinux-sap.repo @@ -7,7 +7,7 @@ gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 metadata_expire=86400 -enabled_metadata=1 +enabled_metadata=0 [sap-debug] name=AlmaLinux $releasever - SAP - Debug diff --git a/almalinux-saphana.repo b/almalinux-saphana.repo index 6a157d1..666e046 100644 --- a/almalinux-saphana.repo +++ b/almalinux-saphana.repo @@ -7,7 +7,7 @@ gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 metadata_expire=86400 -enabled_metadata=1 +enabled_metadata=0 [saphana-debug] name=AlmaLinux $releasever - SAPHANA - Debug From 07c4ab3391fc7667e1364b7c0dd2306623e8c95a Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 24 May 2022 01:56:04 +0200 Subject: [PATCH 4/9] Add DOCUMENTATION_URL to os-release --- almalinux-release.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/almalinux-release.spec b/almalinux-release.spec index b67f293..c790f91 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -113,12 +113,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 From 07acbddaac3c8edd2785ea8c64a0691dab2c7f5a Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 24 May 2022 14:20:58 +0200 Subject: [PATCH 5/9] Add plus repo --- almalinux-plus.repo | 30 ++++++++++++++++++++++++++++++ almalinux-release.spec | 11 +++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 almalinux-plus.repo diff --git a/almalinux-plus.repo b/almalinux-plus.repo new file mode 100644 index 0000000..45c7929 --- /dev/null +++ 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 diff --git a/almalinux-release.spec b/almalinux-release.spec index c790f91..32af1c6 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -54,9 +54,10 @@ Source504: almalinux-highavailability.repo Source505: almalinux-resilientstorage.repo Source506: almalinux-sap.repo Source507: almalinux-saphana.repo +Source508: almalinux-plus.repo # Only for x86_64 -Source508: almalinux-nfv.repo -Source509: almalinux-rt.repo +Source510: almalinux-nfv.repo +Source511: almalinux-rt.repo Source600: RPM-GPG-KEY-AlmaLinux-9 @@ -230,10 +231,11 @@ 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 %{SOURCE508} %{buildroot}%{_sysconfdir}/yum.repos.d/ -install -p -m 0644 %{SOURCE509} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE510} %{buildroot}%{_sysconfdir}/yum.repos.d/ +install -p -m 0644 %{SOURCE511} %{buildroot}%{_sysconfdir}/yum.repos.d/ %endif # dnf variables @@ -282,6 +284,7 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %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 From 24fb059fc05a782b4de0b6b8d7981c4bf43d5212 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 24 May 2022 20:03:24 +0200 Subject: [PATCH 6/9] Enable extras by default --- almalinux-extras.repo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/almalinux-extras.repo b/almalinux-extras.repo index ef34c31..62b72ed 100644 --- a/almalinux-extras.repo +++ b/almalinux-extras.repo @@ -2,7 +2,7 @@ name=AlmaLinux $releasever - Extras mirrorlist=https://mirrors.almalinux.org/mirrorlist/$releasever/extras # baseurl=https://repo.almalinux.org/almalinux/$releasever/extras/$basearch/os/ -enabled=0 +enabled=1 gpgcheck=1 countme=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux-9 From bab1116b89380d37a9df4ec7fc079a583420eddb Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Wed, 22 Jun 2022 12:30:58 +0200 Subject: [PATCH 7/9] Fix AlmaLinux version in EULA --- EULA | 6 ++---- almalinux-release.spec | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/EULA b/EULA index 4c4e71d..dff1ba1 100644 --- a/EULA +++ b/EULA @@ -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. - - diff --git a/almalinux-release.spec b/almalinux-release.spec index 32af1c6..1d05fb8 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -5,7 +5,7 @@ Name: almalinux-release Version: %{major}.%{minor} -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://almalinux.org @@ -295,6 +295,9 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %changelog +* Wed Jun 22 2022 Andrew Lukoshko - 9.0-4 +- Fix AlmaLinux version in EULA + * Mon May 23 2022 Andrew Lukoshko - 9.0-3 - 9.0 stable - Split repo files From ac7f697b0cde1385885b25c4dcfce4591204ebf9 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Wed, 9 Nov 2022 23:10:50 +0100 Subject: [PATCH 8/9] Add stream dnf variable for CentOS SIG repos compatibility --- almalinux-release.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/almalinux-release.spec b/almalinux-release.spec index 1d05fb8..ad6a569 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -240,7 +240,7 @@ install -p -m 0644 %{SOURCE511} %{buildroot}%{_sysconfdir}/yum.repos.d/ # 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 @@ -289,6 +289,7 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %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 From 68979167fc612deee2cbf4143d25e59b5a30224d Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 15 Nov 2022 08:30:59 +0100 Subject: [PATCH 9/9] 9.1 stable release --- 90-default.preset | 5 +++++ almalinux-release.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/90-default.preset b/90-default.preset index e147857..d8b4122 100644 --- a/90-default.preset +++ b/90-default.preset @@ -213,9 +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 diff --git a/almalinux-release.spec b/almalinux-release.spec index ad6a569..3512c0b 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -1,11 +1,11 @@ %global distro AlmaLinux -%global release_name Emerald Puma +%global release_name Lime Lynx %global major 9 -%global minor 0 +%global minor 1 Name: almalinux-release Version: %{major}.%{minor} -Release: 4%{?dist} +Release: 1.9%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://almalinux.org @@ -296,6 +296,9 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %changelog +* Tue Nov 15 2022 Andrew Lukoshko - 9.1-1.9 +- 9.1 stable + * Wed Jun 22 2022 Andrew Lukoshko - 9.0-4 - Fix AlmaLinux version in EULA