rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 971027 from home:lnussel:branches:Base:System

Browse Source 
- use common SBAT values (boo#1193282)

OBS-URL: https://build.opensuse.org/request/show/971027
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=412
This commit is contained in:
Michael Chang 2022-04-21 03:49:55 +00:00 committed by Git OBS Bridge
parent 74d4a644bb
commit 1583b449d8
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
grub2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Apr 11 11:50:04 UTC 2022 - Ludwig Nussel <lnussel@suse.de>
- use common SBAT values (boo#1193282)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 25 03:46:55 UTC 2022 - Michael Chang <mchang@suse.com> Fri Mar 25 03:46:55 UTC 2022 - Michael Chang <mchang@suse.com>

28
grub2.spec
View File

@ -19,6 +19,14 @@
%define _binaries_in_noarch_package_terminate_build 0 %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 Name: grub2
%ifarch x86_64 ppc64 %ifarch x86_64 ppc64
BuildRequires: gcc-32bit BuildRequires: gcc-32bit
@ -663,24 +671,16 @@ cd build-efi
--program-transform-name=s,grub,%{name}, --program-transform-name=s,grub,%{name},
make %{?_smp_mflags} make %{?_smp_mflags}
# SBAT metadata %if 0%{?sbat_generation}
%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
echo "sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md" > sbat.csv 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,%{sbat_generation_grub},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-team@suse.de" >> 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} -d grub-core ${GRUB_MODULES}
%ifarch x86_64 %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 -d grub-core ${GRUB_MODULES} tpm
%endif %endif