Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2022-04-23 00:25:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Sat Apr 23 00:25:02 2022 rev:264 rq:971281 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2022-04-02
18:20:18.630430038 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.1538/grub2.changes 2022-04-23
00:25:07.683745521 +0200
@@ -1,0 +2,5 @@
+Mon Apr 11 11:50:04 UTC 2022 - Ludwig Nussel <lnus...@suse.de>
+
+- use common SBAT values (boo#1193282)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.WOSkEI/_old 2022-04-23 00:25:10.827747196 +0200
+++ /var/tmp/diff_new_pack.WOSkEI/_new 2022-04-23 00:25:10.831747198 +0200
@@ -19,6 +19,14 @@
%define _binaries_in_noarch_package_terminate_build 0
+%if %{defined sbat_distro}
+# SBAT metadata
+%define sbat_generation 1
+%define sbat_generation_grub 1
+%else
+%{error please define sbat_distro, sbat_distro_summary and sbat_distro_url}
+%endif
+
Name: grub2
%ifarch x86_64 ppc64
BuildRequires: gcc-32bit
@@ -663,24 +671,16 @@
--program-transform-name=s,grub,%{name},
make %{?_smp_mflags}
-# SBAT metadata
-%if 0%{?is_opensuse} == 1
-distro_id="opensuse"
-distro_name="The openSUSE Project"
-%else
-distro_id="sle"
-distro_name="SUSE Linux Enterprise"
-%endif
-upstream_sbat=1
-distro_sbat=1
+%if 0%{?sbat_generation}
echo "sbat,1,SBAT
Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md"; > sbat.csv
-echo "grub,${upstream_sbat},Free Software
Foundation,grub,%{version},https://www.gnu.org/software/grub/"; >> sbat.csv
-echo
"grub.${distro_id},${distro_sbat},${distro_name},%{name},%{version},mail:security-t...@suse.de"
>> sbat.csv
+echo "grub,%{sbat_generation_grub},Free Software
Foundation,grub,%{version},https://www.gnu.org/software/grub/"; >> sbat.csv
+echo
"grub.%{sbat_distro},%{sbat_generation},%{sbat_distro_summary},%{name},%{version},%{sbat_distro_url}"
>> sbat.csv
+%endif
-./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= --sbat sbat.csv \
+./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix=
%{?sbat_generation:--sbat sbat.csv} \
-d grub-core ${GRUB_MODULES}
%ifarch x86_64
-./grub-mkimage -O %{grubefiarch} -o grub-tpm.efi --prefix= --sbat sbat.csv \
+./grub-mkimage -O %{grubefiarch} -o grub-tpm.efi --prefix=
%{?sbat_generation:--sbat sbat.csv} \
-d grub-core ${GRUB_MODULES} tpm
%endif
