diff --git a/90-default.preset b/90-default.preset index d8b4122..92129c2 100644 --- a/90-default.preset +++ b/90-default.preset @@ -224,3 +224,4 @@ 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 3512c0b..22f29a1 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -1,11 +1,11 @@ %global distro AlmaLinux -%global release_name Lime Lynx +%global release_name Turquoise Kodkod %global major 9 -%global minor 1 +%global minor 2 Name: almalinux-release Version: %{major}.%{minor} -Release: 1.9%{?dist} +Release: 1%{?dist} Summary: %{distro} release files License: GPLv2 URL: https://almalinux.org @@ -38,13 +38,13 @@ Source302: 90-default-user.preset Source303: 99-default-disable.preset Source304: 50-redhat.conf -Source400: clsecureboot001.cer +Source400: alsecureboot001.cer # kernel signing certificate -Source401: clsecureboot001.cer +Source401: alsecureboot001.cer # grub2 signing certificate -Source402: clsecureboot001.cer +Source402: alsecureboot001.cer # Fwupd signing certificate -Source403: clsecureboot001.cer +Source403: alsecureboot001.cer Source500: almalinux-appstream.repo Source501: almalinux-baseos.repo @@ -100,11 +100,34 @@ echo "%{distro} release %{major}.%{minor}%{?beta: %{beta}} (%{release_name})" > ln -s almalinux-release %{buildroot}%{_sysconfdir}/system-release ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release +# ------------------------------------------------------------------------- +# Definitions for /etc/os-release and for macros in macros.dist. These +# macros are useful for spec files where distribution-specific identifiers +# are used to customize packages. + +# Name of vendor / name of distribution. Typically used to identify where +# the binary comes from in --help or --version messages of programs. +# Examples: gdb.spec, clang.spec +%global dist_vendor AlmaLinux OS Foundation +%global dist_name %{distro} + +# URL of the homepage of the distribution +# Example: gstreamer1-plugins-base.spec +%global dist_home_url https://almalinux.org/ + +# Bugzilla / bug reporting URLs shown to users. +# Examples: gcc.spec +%global dist_bug_report_url https://bugs.almalinux.org/ + +# debuginfod server, as used in elfutils.spec. +# %global dist_debuginfod_url %{nil} +# ------------------------------------------------------------------------- + # Create the os-release file install -d -m 0755 %{buildroot}%{_prefix}/lib cat > %{buildroot}%{_prefix}/lib/os-release << EOF NAME="%{distro}" -VERSION="%{major}.%{minor}%{?beta: %{beta}} (%{release_name})" +VERSION="%{major}.%{minor} (%{release_name})" ID="almalinux" ID_LIKE="rhel centos fedora" VERSION_ID="%{major}.%{minor}" @@ -113,9 +136,9 @@ PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} (%{release_name})" ANSI_COLOR="0;34" LOGO="fedora-logo-icon" CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos" -HOME_URL="https://almalinux.org/" +HOME_URL="%{dist_home_url}" DOCUMENTATION_URL="https://wiki.almalinux.org/" -BUG_REPORT_URL="https://bugs.almalinux.org/" +BUG_REPORT_URL="%{dist_bug_report_url}" ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{major}" ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}.%{minor}" @@ -149,6 +172,10 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF %%rhel %{major} %%dist %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}.el%{major}%%{?with_bootstrap:%{__bootstrap}} %%el%{major} 1 +%%dist_vendor %{dist_vendor} +%%dist_name %{dist_name} +%%dist_home_url %{dist_home_url} +%%dist_bug_report_url %{dist_bug_report_url} EOF # use unbranded datadir @@ -201,25 +228,25 @@ install -m 644 %{SOURCE400} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-s install -m 644 %{SOURCE401} %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer # Link x86_64 certs -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-x86_64.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-x86_64.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-x86_64.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-x86_64.cer +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 +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-x86_64.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-x86_64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-x86_64.cer # Link aarch64 certs -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-aarch64.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-aarch64.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-aarch64.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-aarch64.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-aarch64.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-aarch64.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-aarch64.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-fwupd-aarch64.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-fwupd-aarch64.cer # Link ppc64le certs -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-ppc64le.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-ppc64le.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-ppc64le.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-ppc64le.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-ppc64le.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-grub2-ppc64le.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-grub2-ppc64le.cer # Link s390x certs -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-ca-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-s390x.cer -ln -sr %{buildroot}%{_datadir}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-s390x.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-ca-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-ca-s390x.cer +ln -sr %{buildroot}%{_datadir}/pki/sb-certs/secureboot-kernel-s390x.cer %{buildroot}%{_sysconfdir}/pki/sb-certs/secureboot-kernel-s390x.cer # copy yum repos install -d -m 0755 %{buildroot}%{_sysconfdir}/yum.repos.d @@ -296,6 +323,9 @@ install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ %changelog +* Tue May 02 2023 Andrew Lukoshko - 9.2-1 +- 9.2 stable + * Tue Nov 15 2022 Andrew Lukoshko - 9.1-1.9 - 9.1 stable diff --git a/alsecureboot001.cer b/alsecureboot001.cer new file mode 100644 index 0000000..6a4e99b Binary files /dev/null and b/alsecureboot001.cer differ