From 2485d22941e8621a08f95e83525b86cd3aa2fee0 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Sat, 18 Jun 2022 12:18:02 +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 a1d6984..a88260d 100644 --- a/SPECS/grub2.spec +++ b/SPECS/grub2.spec @@ -49,7 +49,7 @@ Source19: sbat.csv.in %endif # 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 %{SOURCE2} @@ -168,7 +168,7 @@ This subpackage provides tools for support of all platforms. 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" \ %{SOURCE19} > grub-%{grubefiarch}-%{tarversion}/sbat.csv git add grub-%{grubefiarch}-%{tarversion} %endif