pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 958738 from home:michals

Browse Source 
- Remove obsolete openSUSE 12.2 conditionals in spec file
- Clean up powerpc certificate handling.

OBS-URL: https://build.opensuse.org/request/show/958738
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=405
This commit is contained in:
Michael Chang 2022-03-04 02:14:49 +00:00 committed by Git OBS Bridge
parent c8d45660b1
commit ec47fa63cf
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 1 08:55:57 UTC 2022 - Michal Suchanek <msuchanek@suse.com>
- Remove obsolete openSUSE 12.2 conditionals in spec file
- Clean up powerpc certificate handling.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 10 16:20:24 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com> Thu Feb 10 16:20:24 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

15
grub2.spec
View File

@ -53,11 +53,9 @@ BuildRequires: python
%endif %endif
BuildRequires: xz-devel BuildRequires: xz-devel
%ifarch x86_64 aarch64 ppc ppc64 ppc64le %ifarch x86_64 aarch64 ppc ppc64 ppc64le
%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
BuildRequires: openssl >= 0.9.8 BuildRequires: openssl >= 0.9.8
BuildRequires: pesign-obs-integration BuildRequires: pesign-obs-integration
%endif %endif
%endif
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
# Package systemd services files grub2-once.service # Package systemd services files grub2-once.service
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
@ -675,7 +673,6 @@ echo "grub.${distro_id},${distro_sbat},${distro_name},%{name},%{version},mail:se
%endif %endif
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
if test -e %{_sourcedir}/_projectcert.crt ; then if test -e %{_sourcedir}/_projectcert.crt ; then
prjsubject=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout -subject_hash) prjsubject=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout -subject_hash)
prjissuer=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout -issuer_hash) prjissuer=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout -issuer_hash)
@ -698,7 +695,6 @@ fi
openssl x509 -in $cert -outform DER -out grub.der openssl x509 -in $cert -outform DER -out grub.der
%endif %endif
%endif
cd .. cd ..
%endif %endif
@ -729,8 +725,11 @@ TLFLAGS="-static"
make %{?_smp_mflags} make %{?_smp_mflags}
if [ "%{platform}" = "ieee1275" ]; then if [ "%{platform}" = "ieee1275" ]; then
cert="%{_sourcedir}/_projectcert.crt" # So far neither OpenFirmware nor grub support CA chain, only certificate pinning
openssl x509 -in "$cert" -outform DER -out grub.der # Use project certificate always in the shipped informational file and
# for kernel verification
projectcert="%{_sourcedir}/_projectcert.crt"
openssl x509 -in "$projectcert" -outform DER -out grub.der
cat > %{platform}-config <<'EOF' cat > %{platform}-config <<'EOF'
set root=memdisk set root=memdisk
set prefix=($root)/ set prefix=($root)/
@ -835,14 +834,12 @@ EoM
%endif %endif
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
export BRP_PESIGN_FILES="%{_datadir}/%{name}/%{grubefiarch}/grub.efi" export BRP_PESIGN_FILES="%{_datadir}/%{name}/%{grubefiarch}/grub.efi"
%ifarch x86_64 %ifarch x86_64
BRP_PESIGN_FILES="${BRP_PESIGN_FILES} %{_datadir}/%{name}/%{grubefiarch}/grub-tpm.efi" BRP_PESIGN_FILES="${BRP_PESIGN_FILES} %{_datadir}/%{name}/%{grubefiarch}/grub-tpm.efi"
%endif %endif
install -m 444 grub.der %{buildroot}/%{sysefidir}/ install -m 444 grub.der %{buildroot}/%{sysefidir}/
%endif %endif
%endif
cd .. cd ..
%endif %endif
@ -1285,10 +1282,8 @@ fi
%endif %endif
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
%if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
%{sysefidir}/grub.der %{sysefidir}/grub.der
%endif %endif
%endif
%files %{grubefiarch}-debug %files %{grubefiarch}-debug
%defattr(-,root,root,-) %defattr(-,root,root,-)