From 7e411d771fdb04426d1b654070e545c975f580d5 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Sat, 18 Jun 2022 12:23:08 +0000 Subject: [PATCH] Remove epoch from Red Hat sbat entry --- SPECS/grub2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec index 4bddbdd..8a5099b 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -86,7 +86,7 @@ hardware devices.\ %{nil} # AlmaLinux: keep upstream EVR for RHEL SBAT entry -%define rhel_evr $(echo %{evr} | sed 's/\.alma.*//') +%define rhel_version_release $(echo %{version}-%{release} | sed 's/\.alma.*//') # generate with do-rebase %include %{SOURCE11} @@ -180,7 +180,7 @@ This subpackage provides the GRUB user-space emulation modules. mkdir grub-%{grubefiarch}-%{tarversion} grep -A100000 '# stuff "make" creates' .gitignore > grub-%{grubefiarch}-%{tarversion}/.gitignore cp %{SOURCE4} grub-%{grubefiarch}-%{tarversion}/unifont.pcf.gz -sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" -e "s,@@RHEL_VERSION_RELEASE@@,%{rhel_evr},g" \ +sed -e "s,@@VERSION@@,%{version},g" -e "s,@@VERSION_RELEASE@@,%{version}-%{release},g" -e "s,@@RHEL_VERSION_RELEASE@@,%{rhel_version_release},g" \ %{SOURCE12} > grub-%{grubefiarch}-%{tarversion}/sbat.csv git add grub-%{grubefiarch}-%{tarversion} %endif