The package rpms/edk2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/edk2.git/commit/?id=35498843acf90....
Change:
-%ifarch x86_64
Thanks.
Full change:
============
commit f37232bc0f11789a6daa743caca4799d74080ce1
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Tue May 31 09:13:48 2022 +0200
update changelog
diff --git a/edk2.spec b/edk2.spec
index ea9b06b..a624933 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -708,6 +708,11 @@ virt-fw-vars --input
Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.secboot.fd \
%changelog
+* Tue May 31 2022 Gerd Hoffmann <kraxel(a)redhat.com> - 20220526git16779ede2d36-1
+- update to new edk2 stable tag (2022-05), refresh patches.
+- add amdsev and inteltdx builds
+- drop qosb
+
* Tue Apr 19 2022 Gerd Hoffmann <kraxel(a)redhat.com> - 20220221gitb24306f15daa-4
- switch to virt-firmware for secure boot key enrollment
- Stop builds on armv7 too (iasl missing).
commit 19b27c9c59a5943c9cc052015e441b52cb96c3e9
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Tue May 31 08:57:40 2022 +0200
add amdsev and inteltdx builds
diff --git a/edk2-ovmf-amdsev.json b/edk2-ovmf-amdsev.json
new file mode 100644
index 0000000..278fec8
--- /dev/null
+++ b/edk2-ovmf-amdsev.json
@@ -0,0 +1,30 @@
+{
+ "description": "OVMF with SEV-ES support",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "mode": "stateless",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF.amdsev.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "amd-sev",
+ "amd-sev-es",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/edk2-ovmf-inteltdx.json b/edk2-ovmf-inteltdx.json
new file mode 100644
index 0000000..44993ab
--- /dev/null
+++ b/edk2-ovmf-inteltdx.json
@@ -0,0 +1,29 @@
+{
+ "description": "OVMF with TDX support",
+ "interface-types": [
+ "uefi"
+ ],
+ "mapping": {
+ "device": "flash",
+ "mode": "stateless",
+ "executable": {
+ "filename": "/usr/share/edk2/ovmf/OVMF.inteltdx.fd",
+ "format": "raw"
+ }
+ },
+ "targets": [
+ {
+ "architecture": "x86_64",
+ "machines": [
+ "pc-q35-*"
+ ]
+ }
+ ],
+ "features": [
+ "intel-tdx",
+ "verbose-dynamic"
+ ],
+ "tags": [
+
+ ]
+}
diff --git a/edk2.spec b/edk2.spec
index 4812b77..ea9b06b 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -53,6 +53,8 @@ Source11: edk2-aarch64.json
Source12: edk2-ovmf-sb.json
Source13: edk2-ovmf.json
Source14: edk2-ovmf-cc.json
+Source15: edk2-ovmf-amdsev.json
+Source16: edk2-ovmf-inteltdx.json
# Fedora specific sources
Source50: softfloat-%{softfloat_version}.tar.xz
@@ -228,7 +230,8 @@ git config am.keepcr true
%autosetup -T -D -n edk2-%{GITCOMMIT} -S git_am
cp -a -- %{SOURCE1} .
-cp -a -- %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} .
+cp -a -- %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} .
+cp -a -- %{SOURCE14} %{SOURCE15} %{SOURCE16} .
tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x
# Done by %setup, but we do not use it for the auxiliary tarballs
@@ -327,6 +330,13 @@ build ${OVMF_FLAGS} -a X64 \
build ${OVMF_SB_FLAGS} -a IA32 -a X64 \
-p OvmfPkg/OvmfPkgIa32X64.dsc
+# Build AmdSev and IntelTdx variants
+touch OvmfPkg/AmdSev/Grub/grub.efi # dummy
+build ${OVMF_FLAGS} -a X64 \
+ -p OvmfPkg/AmdSev/AmdSevX64.dsc
+build ${OVMF_FLAGS} -a X64 \
+ -p OvmfPkg/IntelTdx/IntelTdxX64.dsc
+
# Sanity check: the varstore templates must be identical.
cmp Build/OvmfX64/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.fd \
Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.fd
@@ -436,6 +446,11 @@ install -m 0644
Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.secboot.fd \
install -m 0644 Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/X64/UefiShell.iso \
%{buildroot}%{_datadir}/%{name}/ovmf/UefiShell.iso
+install -m 0644 Build/AmdSev/DEBUG_%{TOOLCHAIN}/FV/OVMF.fd \
+ %{buildroot}%{_datadir}/%{name}/ovmf/OVMF.amdsev.fd
+install -m 0644 Build/IntelTdx/DEBUG_%{TOOLCHAIN}/FV/OVMF.fd \
+ %{buildroot}%{_datadir}/%{name}/ovmf/OVMF.inteltdx.fd
+
ln -s ../%{name}/ovmf/OVMF_CODE.fd %{buildroot}%{_datadir}/OVMF
ln -s ../%{name}/ovmf/OVMF_CODE.secboot.fd %{buildroot}%{_datadir}/OVMF/
ln -s ../%{name}/ovmf/OVMF_VARS.fd %{buildroot}%{_datadir}/OVMF/
@@ -453,6 +468,10 @@ install -m 0644 edk2-ovmf.json \
%{buildroot}%{_datadir}/qemu/firmware/50-edk2-ovmf.json
install -m 0644 edk2-ovmf-cc.json \
%{buildroot}%{_datadir}/qemu/firmware/50-edk2-ovmf-cc.json
+install -m 0644 edk2-ovmf-amdsev.json \
+ %{buildroot}%{_datadir}/qemu/firmware/50-edk2-ovmf-amdsev.json
+install -m 0644 edk2-ovmf-inteltdx.json \
+ %{buildroot}%{_datadir}/qemu/firmware/50-edk2-ovmf-inteltdx.json
# endif build_ovmf
%endif
@@ -574,6 +593,8 @@ virt-fw-vars --input
Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.secboot.fd \
%{_datadir}/%{name}/ovmf/OVMF_CODE.secboot.fd
%{_datadir}/%{name}/ovmf/OVMF_VARS.fd
%{_datadir}/%{name}/ovmf/OVMF_VARS.secboot.fd
+%{_datadir}/%{name}/ovmf/OVMF.amdsev.fd
+%{_datadir}/%{name}/ovmf/OVMF.inteltdx.fd
%{_datadir}/%{name}/ovmf/UefiShell.iso
%{_datadir}/OVMF/OVMF_CODE.fd
%{_datadir}/OVMF/OVMF_CODE.secboot.fd
@@ -584,6 +605,8 @@ virt-fw-vars --input
Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.secboot.fd \
%{_datadir}/%{name}/ovmf/EnrollDefaultKeys.efi
%{_datadir}/qemu/firmware/40-edk2-ovmf-sb.json
%{_datadir}/qemu/firmware/50-edk2-ovmf-cc.json
+%{_datadir}/qemu/firmware/50-edk2-ovmf-amdsev.json
+%{_datadir}/qemu/firmware/50-edk2-ovmf-inteltdx.json
%{_datadir}/qemu/firmware/50-edk2-ovmf.json
%if %{defined fedora}
%{_datadir}/%{name}/ovmf/MICROVM.fd
commit 3414d607f6ad1f6258dbd2b09f06ba3c37ad13f7
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Tue May 31 08:07:43 2022 +0200
rhel machine type is pointless for fedora
diff --git a/edk2-ovmf-cc.json b/edk2-ovmf-cc.json
index 2e52745..68ac090 100644
--- a/edk2-ovmf-cc.json
+++ b/edk2-ovmf-cc.json
@@ -18,7 +18,7 @@
{
"architecture": "x86_64",
"machines": [
- "pc-q35-rhel8.5.0"
+ "pc-q35-*"
]
}
],
commit 35498843acf90d811e7138aeaaf7b3ad5ab66522
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Wed May 25 13:37:49 2022 +0200
drop qosb
not needed any more now that we use virt-firmware instead
diff --git a/LICENSE.qosb b/LICENSE.qosb
deleted file mode 100644
index 9849381..0000000
--- a/LICENSE.qosb
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Patrick Uiterwijk
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/RedHatSecureBootPkKek1.pem b/RedHatSecureBootPkKek1.pem
deleted file mode 100644
index d302362..0000000
--- a/RedHatSecureBootPkKek1.pem
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIJAP71iOjzlsDxMA0GCSqGSIb3DQEBCwUAMFExKzApBgNV
-BAMTIlJlZCBIYXQgU2VjdXJlIEJvb3QgKFBLL0tFSyBrZXkgMSkxIjAgBgkqhkiG
-9w0BCQEWE3NlY2FsZXJ0QHJlZGhhdC5jb20wHhcNMTQxMDMxMTExNTM3WhcNMzcx
-MDI1MTExNTM3WjBRMSswKQYDVQQDEyJSZWQgSGF0IFNlY3VyZSBCb290IChQSy9L
-RUsga2V5IDEpMSIwIAYJKoZIhvcNAQkBFhNzZWNhbGVydEByZWRoYXQuY29tMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkB+Ee42865cmgm2Iq4rJjGhw
-+d9LB7I3gwsCyGdoMJ7j8PCZSrhZV8ZB9jiL/mZMSek3N5IumAEeWxRQ5qiNJQ31
-huarMMtAFuqNixaGcEM38s7Akd9xFI6ZDom2TG0kHozkL08l0LoG+MboGRh2cx2B
-bajYBc86yHsoyDajFg0pjJmaaNyrwE2Nv1q7K6k5SwSXHPk2u8U6hgSur9SCe+Cr
-3kkFaPz2rmgabJBNVxk8ZGYD9sdSm/eUz5NqoWjJqs+Za7yqXgjnORz3+A+6Bn7x
-y+h23f4i2q06Xls06rPJ4E0EKX64YLkF77XZF1hWFmC5MDLwNkrD8nmNEkBw8wID
-AQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVy
-YXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUPOlg4/8ZoQp7o0L0jUIutNWccuww
-HwYDVR0jBBgwFoAUPOlg4/8ZoQp7o0L0jUIutNWccuwwDQYJKoZIhvcNAQELBQAD
-ggEBAFxNkoi0gl8drYsR7N8GpnqlK583VQyNbgUArbcMQYlpz9ZlBptReNKtx7+c
-3AVzf+ceORO06rYwfUB1q5xDC9+wwhu/MOD0/sDbYiGY9sWv3jtPSQrmHvmGsD8N
-1tRGN9tUdF7/EcJgxnBYxRxv7LLYbm/DvDOHOKTzRGScNDsolCZ4J58WF+g7aQol
-qXM2fp43XOzoP9uR+RKzPc7n3RXDrowFIGGbld6br/qxXBzll+fDNBGF9YonJqRw
-NuwM9oM9kPc28/nzFdSQYr5TtK/TSa/v9HPoe3bkRCo3uoGkmQw6MSRxoOTktxrL
-R+SqIs/vdWGA40O3SFdzET14m2k=
------END CERTIFICATE-----
diff --git a/edk2.spec b/edk2.spec
index bf1376a..4812b77 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -14,11 +14,6 @@ ExclusiveArch: x86_64 aarch64
%define TOOLCHAIN GCC5
%define OPENSSL_VER 1.1.1k
-%define qosb_testing 0
-%ifarch x86_64
-%define qosb_testing 1
-%endif
-
%if %{defined rhel}
%define build_ovmf 0
%define build_aarch64 0
@@ -52,9 +47,6 @@ URL:
http://www.tianocore.org
Source0: edk2-%{GITCOMMIT}.tar.xz
Source1: ovmf-whitepaper-c770f8c.txt
Source2: openssl-rhel-bdd048e929dcfcf2f046d74e812e0e3d5fc58504.tar.xz
-Source3: ovmf-vars-generator
-Source4: LICENSE.qosb
-Source5: RedHatSecureBootPkKek1.pem
Source10: edk2-aarch64-verbose.json
Source11: edk2-aarch64.json
@@ -119,13 +111,6 @@ BuildRequires: xorriso
# enrolled.
BuildRequires: python3-virt-firmware
-%if %{qosb_testing}
-# For verifying SB enablement in the above variable store template, we need a
-# guest kernel that prints "Secure boot enabled".
-BuildRequires: kernel-core >= 4.18.0-161
-BuildRequires: rpmdevtools
-%endif
-
# endif build_ovmf
%endif
@@ -217,14 +202,6 @@ License: BSD-2-Clause-Patent and OpenSSL
EFI Development Kit II
ARMv7 UEFI Firmware
-%package qosb
-Summary: Tool to enroll secureboot
-Requires: python3
-Buildarch: noarch
-%description qosb
-This package contains QOSB (QEMU OVMF Secure Boot), which can enroll OVMF
-variable files to enforce Secure Boot.
-
%package tools-python
Summary: EFI Development Kit II Tools
Requires: python3
@@ -250,27 +227,13 @@ git config am.keepcr true
# -D is passed to %%setup to not delete the existing archive dir
%autosetup -T -D -n edk2-%{GITCOMMIT} -S git_am
-cp -a -- %{SOURCE1} %{SOURCE3} .
+cp -a -- %{SOURCE1} .
cp -a -- %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} .
tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x
-# Format the Red Hat-issued certificate that is to be enrolled as both Platform
-# Key and first Key Exchange Key, as an SMBIOS OEM String. This means stripping
-# the PEM header and footer, and prepending the textual representation of the
-# GUID that identifies this particular OEM String to "EnrollDefaultKeys.efi",
-# plus the separator ":". For details, see
-# <
https://bugzilla.tianocore.org/show_bug.cgi?id=1747> comments 2, 7, 14.
-sed \
- -e 's/^-----BEGIN CERTIFICATE-----$/4e32566d-8e9e-4f52-81d3-5bb9715f9727:/' \
- -e '/^-----END CERTIFICATE-----$/d' \
- %{SOURCE5} \
- > PkKek1.oemstr
-
# Done by %setup, but we do not use it for the auxiliary tarballs
chmod -Rf a+rX,u+w,g-w,o-w .
-# Fedora specific
-cp -a -- %{SOURCE4} .
# extract softfloat into place
tar -xf %{SOURCE50} --strip-components=1 --directory
ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3/
@@ -584,24 +547,15 @@ done
%py_byte_compile %{python3} %{buildroot}%{_datadir}/edk2/Python
%endif
-# edk2-qosb install
-install -p ovmf-vars-generator %{buildroot}%{_bindir}
-
# endif defined fedora
%endif
%check
-
-%if %{qosb_testing}
virt-fw-vars --input Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.secboot.fd \
--print | grep "SecureBootEnable.*ON"
-# endif qosb_testing
-%endif
-
-
%global common_files \
%%license License.txt License.OvmfPkg.txt License-History.txt LICENSE.openssl \
%%dir %%{_datadir}/%%{name}/ \
@@ -726,11 +680,6 @@ virt-fw-vars --input
Build/Ovmf3264/DEBUG_%{TOOLCHAIN}/FV/OVMF_VARS.secboot.fd \
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/Python
-
-%files qosb
-%license LICENSE.qosb
-%{_bindir}/ovmf-vars-generator
-
# endif fedora
%endif
diff --git a/ovmf-vars-generator b/ovmf-vars-generator
deleted file mode 100755
index 111e438..0000000
--- a/ovmf-vars-generator
+++ /dev/null
@@ -1,295 +0,0 @@
-#!/bin/python3
-# Copyright (C) 2017 Red Hat
-# Authors:
-# - Patrick Uiterwijk <puiterwijk(a)redhat.com>
-# - Kashyap Chamarthy <kchamart(a)redhat.com>
-#
-# Licensed under MIT License, for full text see LICENSE
-#
-# Purpose: Launch a QEMU guest and enroll ithe UEFI keys into an OVMF
-# variables ("VARS") file. Then boot a Linux kernel with QEMU.
-# Finally, perform a check to verify if Secure Boot
-# is enabled.
-
-from __future__ import print_function
-
-import argparse
-import os
-import logging
-import tempfile
-import shutil
-import string
-import subprocess
-
-
-def strip_special(line):
- return ''.join([c for c in str(line) if c in string.printable])
-
-
-def generate_qemu_cmd(args, readonly, *extra_args):
- if args.disable_smm:
- machinetype = 'pc'
- else:
- machinetype = 'q35,smm=on'
- machinetype += ',accel=%s' % ('kvm' if args.enable_kvm else
'tcg')
-
- if args.oem_string is None:
- oemstrings = []
- else:
- oemstring_values = [
- ",value=" + s.replace(",", ",,") for s in
args.oem_string ]
- oemstrings = [
- '-smbios',
- "type=11" + ''.join(oemstring_values) ]
-
- return [
- args.qemu_binary,
- '-machine', machinetype,
- '-display', 'none',
- '-no-user-config',
- '-nodefaults',
- '-m', '768',
- '-smp', '2,sockets=2,cores=1,threads=1',
- '-chardev', 'pty,id=charserial1',
- '-device', 'isa-serial,chardev=charserial1,id=serial1',
- '-global', 'driver=cfi.pflash01,property=secure,value=%s' % (
- 'off' if args.disable_smm else 'on'),
- '-drive',
- 'file=%s,if=pflash,format=raw,unit=0,readonly=on' % (
- args.ovmf_binary),
- '-drive',
- 'file=%s,if=pflash,format=raw,unit=1,readonly=%s' % (
- args.out_temp, 'on' if readonly else 'off'),
- '-serial', 'stdio'] + oemstrings + list(extra_args)
-
-
-def download(url, target, suffix, no_download):
- istemp = False
- if target and os.path.exists(target):
- return target, istemp
- if not target:
- temped = tempfile.mkstemp(prefix='qosb.', suffix='.%s' % suffix)
- os.close(temped[0])
- target = temped[1]
- istemp = True
- if no_download:
- raise Exception('%s did not exist, but downloading was disabled' %
- target)
- import requests
- logging.debug('Downloading %s to %s', url, target)
- r = requests.get(url, stream=True)
- with open(target, 'wb') as f:
- for chunk in r.iter_content(chunk_size=1024):
- if chunk:
- f.write(chunk)
- return target, istemp
-
-
-def enroll_keys(args):
- shutil.copy(args.ovmf_template_vars, args.out_temp)
-
- logging.info('Starting enrollment')
-
- cmd = generate_qemu_cmd(
- args,
- False,
- '-drive',
- 'file=%s,format=raw,if=none,media=cdrom,id=drive-cd1,'
- 'readonly=on' % args.uefi_shell_iso,
- '-device',
- 'ide-cd,drive=drive-cd1,id=cd1,'
- 'bootindex=1')
- p = subprocess.Popen(cmd,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT)
- logging.info('Performing enrollment')
- # Wait until the UEFI shell starts (first line is printed)
- read = p.stdout.readline()
- if b'char device redirected' in read:
- read = p.stdout.readline()
- # Skip passed QEMU warnings, like the following one we see in Ubuntu:
- # qemu-system-x86_64: warning: TCG doesn't support requested feature:
CPUID.01H:ECX.vmx [bit 5]
- while b'qemu-system-x86_64: warning:' in read:
- read = p.stdout.readline()
- if args.print_output:
- print(strip_special(read), end='')
- print()
- # Send the escape char to enter the UEFI shell early
- p.stdin.write(b'\x1b')
- p.stdin.flush()
- # And then run the following three commands from the UEFI shell:
- # change into the first file system device; install the default
- # keys and certificates, and reboot
- p.stdin.write(b'fs0:\r\n')
- p.stdin.write(b'EnrollDefaultKeys.efi\r\n')
- p.stdin.write(b'reset -s\r\n')
- p.stdin.flush()
- while True:
- read = p.stdout.readline()
- if args.print_output:
- print('OUT: %s' % strip_special(read), end='')
- print()
- if b'info: success' in read:
- break
- p.wait()
- if args.print_output:
- print(strip_special(p.stdout.read()), end='')
- logging.info('Finished enrollment')
-
-
-def test_keys(args):
- logging.info('Grabbing test kernel')
- kernel, kerneltemp = download(args.kernel_url, args.kernel_path,
- 'kernel', args.no_download)
-
- logging.info('Starting verification')
- try:
- cmd = generate_qemu_cmd(
- args,
- True,
- '-append', 'console=tty0 console=ttyS0,115200n8',
- '-kernel', kernel)
- p = subprocess.Popen(cmd,
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT)
- logging.info('Performing verification')
- while True:
- read = p.stdout.readline()
- if args.print_output:
- print('OUT: %s' % strip_special(read), end='')
- print()
- if b'Secure boot disabled' in read:
- raise Exception('Secure Boot was disabled')
- elif b'Secure boot enabled' in read:
- logging.info('Confirmed: Secure Boot is enabled')
- break
- elif b'Kernel is locked down from EFI secure boot' in read:
- logging.info('Confirmed: Secure Boot is enabled')
- break
- p.kill()
- if args.print_output:
- print(strip_special(p.stdout.read()), end='')
- logging.info('Finished verification')
- finally:
- if kerneltemp:
- os.remove(kernel)
-
-
-def parse_args():
- parser = argparse.ArgumentParser()
- parser.add_argument('output', help='Filename for output vars file')
- parser.add_argument('--out-temp', help=argparse.SUPPRESS)
- parser.add_argument('--force', help='Overwrite existing output
file',
- action='store_true')
- parser.add_argument('--print-output', help='Print the QEMU guest
output',
- action='store_true')
- parser.add_argument('--verbose', '-v', help='Increase
verbosity',
- action='count')
- parser.add_argument('--quiet', '-q', help='Decrease
verbosity',
- action='count')
- parser.add_argument('--qemu-binary', help='QEMU binary path',
- default='/usr/bin/qemu-system-x86_64')
- parser.add_argument('--enable-kvm', help='Enable KVM acceleration',
- action='store_true')
- parser.add_argument('--ovmf-binary', help='OVMF secureboot code
file',
- default='/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd')
- parser.add_argument('--ovmf-template-vars', help='OVMF empty vars
file',
- default='/usr/share/edk2/ovmf/OVMF_VARS.fd')
- parser.add_argument('--uefi-shell-iso', help='Path to uefi shell
iso',
- default='/usr/share/edk2/ovmf/UefiShell.iso')
- parser.add_argument('--skip-enrollment',
- help='Skip enrollment, only test',
action='store_true')
- parser.add_argument('--skip-testing',
- help='Skip testing generated "VARS" file',
- action='store_true')
- parser.add_argument('--kernel-path',
- help='Specify a consistent path for kernel')
- parser.add_argument('--no-download', action='store_true',
- help='Never download a kernel')
- parser.add_argument('--fedora-version',
- help='Fedora version to get kernel for checking',
- default='27')
- parser.add_argument('--kernel-url', help='Kernel URL',
-
default='https://download.fedoraproject.org/pub/fedora'
- '/linux/releases/%(version)s/Everything/x86_64'
- '/os/images/pxeboot/vmlinuz')
- parser.add_argument('--disable-smm',
- help=('Don\'t restrict varstore pflash writes to '
- 'guest code that executes in SMM. Use this '
- 'option only if your OVMF binary doesn\'t have
'
- 'the edk2 SMM driver stack built into it '
- '(possibly because your QEMU binary lacks SMM '
- 'emulation). Note that without restricting '
- 'varstore pflash writes to guest code that '
- 'executes in SMM, a malicious guest kernel, '
- 'used for testing, could undermine Secure '
- 'Boot.'),
- action='store_true')
- parser.add_argument('--oem-string',
- help=('Pass the argument to the guest as a string in '
- 'the SMBIOS Type 11 (OEM Strings) table. '
- 'Multiple occurrences of this option are '
- 'collected into a single SMBIOS Type 11 table. '
- 'A pure ASCII string argument is strongly '
- 'suggested.'),
- action='append')
- args = parser.parse_args()
- args.kernel_url = args.kernel_url % {'version': args.fedora_version}
-
- validate_args(args)
- return args
-
-
-def validate_args(args):
- if (os.path.exists(args.output)
- and not args.force
- and not args.skip_enrollment):
- raise Exception('%s already exists' % args.output)
-
- if args.skip_enrollment and not os.path.exists(args.output):
- raise Exception('%s does not yet exist' % args.output)
-
- verbosity = (args.verbose or 1) - (args.quiet or 0)
- if verbosity >= 2:
- logging.basicConfig(level=logging.DEBUG)
- elif verbosity == 1:
- logging.basicConfig(level=logging.INFO)
- elif verbosity < 0:
- logging.basicConfig(level=logging.ERROR)
- else:
- logging.basicConfig(level=logging.WARN)
-
- if args.skip_enrollment:
- args.out_temp = args.output
- else:
- temped = tempfile.mkstemp(prefix='qosb.', suffix='.vars')
- os.close(temped[0])
- args.out_temp = temped[1]
- logging.debug('Temp output: %s', args.out_temp)
-
-
-def move_to_dest(args):
- shutil.copy(args.out_temp, args.output)
- os.remove(args.out_temp)
-
-
-def main():
- args = parse_args()
- if not args.skip_enrollment:
- enroll_keys(args)
- if not args.skip_testing:
- test_keys(args)
- if not args.skip_enrollment:
- move_to_dest(args)
- if args.skip_testing:
- logging.info('Created %s' % args.output)
- else:
- logging.info('Created and verified %s' % args.output)
- else:
- logging.info('Verified %s', args.output)
-
-
-if __name__ == '__main__':
- main()
commit 0476d891c1e50c8058cd8fbfa6a3867bcfd7636b
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Mon May 30 11:31:22 2022 +0200
refresh patches
some non-trivial updates in
0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
automatic git rebase otherwise
diff --git a/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch
b/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch
index 298d93b..61dd726 100644
--- a/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch
+++ b/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch
@@ -1,4 +1,4 @@
-From 61e29798c9c4e6b89a8e5c50939c6ab2f9ba3478 Mon Sep 17 00:00:00 2001
+From a5e7f28a51b616d79bf3e80ce185260a75c20caa Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Thu, 4 Jun 2020 13:34:12 +0200
Subject: [PATCH 01/21] BaseTools: do not build BrotliCompress (RH only)
@@ -39,5 +39,5 @@ index 8c191e0c3817..3eae824a1c31 100644
EfiRom \
GenFfs \
--
-2.35.1
+2.35.3
diff --git a/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch
b/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch
index c20a494..ec631f4 100644
--- a/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch
+++ b/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch
@@ -1,4 +1,4 @@
-From f4eea2685593bc4f39ebc50d79b849fd853a3a62 Mon Sep 17 00:00:00 2001
+From 77bc79dfc2d70a7ffe81ab4c764bb5b503e34b07 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Thu, 4 Jun 2020 13:39:08 +0200
Subject: [PATCH 02/21] MdeModulePkg: remove package-private Brotli include
@@ -32,7 +32,7 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
1 file changed, 3 deletions(-)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
-index 40601c95832b..56138abbe407 100644
+index 2bcb9f9453af..f549276b8061 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -24,9 +24,6 @@ [Defines]
@@ -46,5 +46,5 @@ index 40601c95832b..56138abbe407 100644
## @libraryclass Defines a set of methods to reset whole system.
ResetSystemLib|Include/Library/ResetSystemLib.h
--
-2.35.1
+2.35.3
diff --git a/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch
b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch
index d5e571e..87e7078 100644
--- a/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch
+++ b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch
@@ -1,4 +1,4 @@
-From 6c102285ab54deba5098316e9a56a95e6895c866 Mon Sep 17 00:00:00 2001
+From 967e66ce4fbce81338ed4cdd9131a4a25a24e461 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Thu, 20 Feb 2014 22:54:45 +0100
Subject: [PATCH 03/21] OvmfPkg: increase max debug message length to 512 (RHEL
@@ -79,5 +79,5 @@ index 4e25f198aa76..640627f38b72 100644
//
// VA_LIST can not initialize to NULL for all compiler, so we use this to
--
-2.35.1
+2.35.3
diff --git a/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch
b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch
index bd3661f..fabcf69 100644
--- a/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch
+++ b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch
@@ -1,4 +1,4 @@
-From 986f59c22b45facd1bd124896a5c655d901065a3 Mon Sep 17 00:00:00 2001
+From 8708aff7d939989ab52932c1329c81dfe86bdc61 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Tue, 25 Feb 2014 18:40:35 +0100
Subject: [PATCH 04/21] MdeModulePkg: TerminalDxe: add other text resolutions
@@ -165,5 +165,5 @@ index e2d779c78378..f238c4103b3d 100644
// New modes can be added here.
//
--
-2.35.1
+2.35.3
diff --git a/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
index 18937e3..6146c29 100644
--- a/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
+++ b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch
@@ -1,4 +1,4 @@
-From 7d89e95bad10d53c0b58f96606d076fe73a648cb Mon Sep 17 00:00:00 2001
+From 8fd6e63635f50b2dc9e950056f17c1688107647d Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Tue, 25 Feb 2014 22:40:01 +0100
Subject: [PATCH 05/21] MdeModulePkg: TerminalDxe: set xterm resolution on mode
@@ -87,12 +87,12 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
3 files changed, 35 insertions(+)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
-index 56138abbe407..8a2bc9e4f80b 100644
+index f549276b8061..1415766054be 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
-@@ -2080,6 +2080,10 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic,
PcdsDynamicEx]
- # @Prompt Enable PCIe Resizable BAR Capability support.
- gEfiMdeModulePkgTokenSpaceGuid.PcdPcieResizableBarSupport|FALSE|BOOLEAN|0x10000024
+@@ -2092,6 +2092,10 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic,
PcdsDynamicEx]
+ # @Prompt The shared bit mask when Intel Tdx is enabled.
+ gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask|0x0|UINT64|0x10000025
+ ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal
+ # mode change.
@@ -176,5 +176,5 @@ index 7809869e7d49..496849458db4 100644
Status = This->ClearScreen (This);
--
-2.35.1
+2.35.3
diff --git a/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
index df5c8a1..3565a4a 100644
--- a/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
+++ b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch
@@ -1,9 +1,14 @@
-From d0b512ade91abd2183c879a07663ceb085b261a2 Mon Sep 17 00:00:00 2001
+From b969a329b7a7df0f8f25c8497eaa3c0987b69265 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Wed, 14 Oct 2015 15:59:06 +0200
Subject: [PATCH 06/21] OvmfPkg: take PcdResizeXterm from the QEMU command line
(RH only)
+edk2-stable202205 rebase
+
+- re-add UPDATE_BOOLEAN_PCD_FROM_FW_CFG
+- add microvm, cloudhw and inteltdx
+
edk2-stable202108 rebase
- resolve conflict in OvmfPkg/PlatformPei/PlatformPei.inf
@@ -71,31 +76,70 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
(cherry picked from commit 2cc462ee963d0be119bc97bfc9c70d292a40516f)
(cherry picked from commit 51e0de961029af84b5bdbfddcc9762b1819d500f)
---
- OvmfPkg/AmdSev/AmdSevX64.dsc | 1 +
- OvmfPkg/OvmfPkgIa32.dsc | 1 +
- OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
- OvmfPkg/OvmfPkgX64.dsc | 1 +
- OvmfPkg/PlatformPei/PlatformPei.inf | 1 +
- OvmfPkg/PlatformPei/Platform.c | 1 +
- 6 files changed, 6 insertions(+)
+ OvmfPkg/AmdSev/AmdSevX64.dsc | 1 +
+ OvmfPkg/CloudHv/CloudHvX64.dsc | 1 +
+ OvmfPkg/IntelTdx/IntelTdxX64.dsc | 1 +
+ OvmfPkg/Microvm/MicrovmX64.dsc | 1 +
+ OvmfPkg/OvmfPkgIa32.dsc | 1 +
+ OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
+ OvmfPkg/OvmfPkgX64.dsc | 1 +
+ OvmfPkg/PlatformPei/PlatformPei.inf | 1 +
+ OvmfPkg/PlatformPei/Platform.c | 13 +++++++++++++
+ 9 files changed, 21 insertions(+)
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index fd56176796d5..d1f9bc6d0d61 100644
+index fc1fdb2e2297..ae23094ffc27 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -519,6 +519,7 @@ [PcdsFixedAtBuild]
+@@ -524,6 +524,7 @@ [PcdsFixedAtBuild]
[PcdsDynamicDefault]
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
+diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
+index 92664f319be2..4aa54e4dc3fb 100644
+--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
++++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
+@@ -574,6 +574,7 @@ [PcdsDynamicDefault]
+ # ($(SMM_REQUIRE) == FALSE)
+ gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
+
++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+ !if $(SMM_REQUIRE) == FALSE
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
+diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
+index dd8d446f4a56..ec1aab6f0939 100644
+--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
++++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
+@@ -461,6 +461,7 @@ [PcdsDynamicDefault]
+ # ($(SMM_REQUIRE) == FALSE)
+ gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
+
++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
+diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
+index f8fc977cb205..4e5ab89c8f0d 100644
+--- a/OvmfPkg/Microvm/MicrovmX64.dsc
++++ b/OvmfPkg/Microvm/MicrovmX64.dsc
+@@ -557,6 +557,7 @@ [PcdsDynamicDefault]
+ # ($(SMM_REQUIRE) == FALSE)
+ gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
+
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index 85abed24c1a7..6bcd222af7c2 100644
+index a9841cbfc3ca..b69e3c05a281 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -580,6 +580,7 @@ [PcdsDynamicDefault]
+@@ -585,6 +585,7 @@ [PcdsDynamicDefault]
# ($(SMM_REQUIRE) == FALSE)
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
@@ -104,10 +148,10 @@ index 85abed24c1a7..6bcd222af7c2 100644
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index a9c1daecc1a8..0cce3b768e12 100644
+index f7949780fa38..726011ec42a5 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -586,6 +586,7 @@ [PcdsDynamicDefault]
+@@ -593,6 +593,7 @@ [PcdsDynamicDefault]
# ($(SMM_REQUIRE) == FALSE)
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
@@ -116,10 +160,10 @@ index a9c1daecc1a8..0cce3b768e12 100644
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 718399299f57..847cf6a46652 100644
+index 1448f925b782..ab2e31ea8f2b 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -585,6 +585,7 @@ [PcdsDynamicDefault]
+@@ -612,6 +612,7 @@ [PcdsDynamicDefault]
# ($(SMM_REQUIRE) == FALSE)
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
@@ -128,10 +172,10 @@ index 718399299f57..847cf6a46652 100644
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
-index 212aa7b04751..1c0b7204ea9a 100644
+index 00372fa0ebb5..2dfa357c384a 100644
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
-@@ -97,6 +97,7 @@ [Pcd]
+@@ -98,6 +98,7 @@ [Pcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
@@ -140,17 +184,36 @@ index 212aa7b04751..1c0b7204ea9a 100644
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
-index d0323c645162..9011a55d0f90 100644
+index f006755d5fdb..b8f56902512c 100644
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
-@@ -851,6 +851,7 @@ InitializePlatform (
+@@ -41,6 +41,18 @@
+
+ #include "Platform.h"
+
++#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \
++ do { \
++ BOOLEAN Setting; \
++ RETURN_STATUS PcdStatus; \
++ \
++ if (!RETURN_ERROR (QemuFwCfgParseBool ( \
++ "opt/ovmf/" #TokenName, &Setting))) { \
++ PcdStatus = PcdSetBoolS (TokenName, Setting); \
++ ASSERT_RETURN_ERROR (PcdStatus); \
++ } \
++ } while (0)
++
+ EFI_HOB_PLATFORM_INFO mPlatformInfoHob = { 0 };
+
+ EFI_PEI_PPI_DESCRIPTOR mPpiBootMode[] = {
+@@ -387,6 +399,7 @@ InitializePlatform (
MemTypeInfoInitialization ();
- MemMapInitialization ();
+ MemMapInitialization (&mPlatformInfoHob);
NoexecDxeInitialization ();
+ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm);
}
InstallClearCacheCallback ();
--
-2.35.1
+2.35.3
diff --git a/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
index f0eeeac..5db05d1 100644
--- a/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
+++ b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch
@@ -1,4 +1,4 @@
-From 39b83b28b9239d2c55226f4861c469f38fd967d1 Mon Sep 17 00:00:00 2001
+From b991e60356f0b990792a8951f8856d6544a9cd9b Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Sun, 26 Jul 2015 08:02:50 +0000
Subject: [PATCH 07/21] ArmVirtPkg: take PcdResizeXterm from the QEMU command
@@ -96,10 +96,10 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
-index b2b0d304d335..6960df62b082 100644
+index aa0ce61630f7..7705bf391976 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
-@@ -282,6 +282,8 @@ [PcdsDynamicDefault.common]
+@@ -284,6 +284,8 @@ [PcdsDynamicDefault.common]
gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0
!endif
@@ -108,7 +108,7 @@ index b2b0d304d335..6960df62b082 100644
[PcdsDynamicHii]
gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS
-@@ -384,7 +386,10 @@ [Components.common]
+@@ -386,7 +388,10 @@ [Components.common]
MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -200,5 +200,5 @@ index 000000000000..bfd3a6a535f9
+ return RETURN_SUCCESS;
+}
--
-2.35.1
+2.35.3
diff --git a/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
index e57d931..4c433f8 100644
--- a/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
+++ b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch
@@ -1,4 +1,4 @@
-From 2d7c77e17a3461d53521b42221e468fb234d5893 Mon Sep 17 00:00:00 2001
+From 6c0b7391222b4d33dbcee952b0f785701031e972 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Tue, 4 Nov 2014 23:02:53 +0100
Subject: [PATCH 08/21] OvmfPkg: allow exclusion of the shell from the firmware
@@ -111,10 +111,10 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
3 files changed, 6 insertions(+)
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
-index a6b2142ccd0c..b5bc8407e7d7 100644
+index 57d13b7130bc..69044874e2f7 100644
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
-@@ -283,12 +283,14 @@ [FV.DXEFV]
+@@ -298,12 +298,14 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
@@ -130,10 +130,10 @@ index a6b2142ccd0c..b5bc8407e7d7 100644
INF MdeModulePkg/Logo/LogoDxe.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
-index 49266dd46768..f4fa19bb013c 100644
+index ccde366887a9..bf535bef4200 100644
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
-@@ -287,12 +287,14 @@ [FV.DXEFV]
+@@ -299,12 +299,14 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
@@ -149,10 +149,10 @@ index 49266dd46768..f4fa19bb013c 100644
INF MdeModulePkg/Logo/LogoDxe.inf
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
-index ba7f26d01dc4..dfd17804c2a2 100644
+index 438806fba8f1..21e4ce00dde6 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
-@@ -309,12 +309,14 @@ [FV.DXEFV]
+@@ -324,12 +324,14 @@ [FV.DXEFV]
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
@@ -168,5 +168,5 @@ index ba7f26d01dc4..dfd17804c2a2 100644
INF MdeModulePkg/Logo/LogoDxe.inf
--
-2.35.1
+2.35.3
diff --git a/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
index c1f24b1..b33a5c0 100644
--- a/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
+++ b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch
@@ -1,4 +1,4 @@
-From da4731a05cd2279c5ba504ad117ccd6256d75305 Mon Sep 17 00:00:00 2001
+From a432c70d28e61a51047616cedc75ca54257d1558 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Wed, 14 Oct 2015 13:49:43 +0200
Subject: [PATCH 09/21] ArmPlatformPkg: introduce fixed PCD for early hello
@@ -90,5 +90,5 @@ index 3a25ddcdc8ca..b2b58553c7a6 100644
## PL031 RealTimeClock
gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024
--
-2.35.1
+2.35.3
diff --git a/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
index 557ac1e..b97875c 100644
--- a/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
+++ b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch
@@ -1,4 +1,4 @@
-From 2ac5fede049429237cb2a698a9f927f21fd22c6e Mon Sep 17 00:00:00 2001
+From 1492c375e52d3cc6d8c39fc4853f10ceeca2948c Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Wed, 14 Oct 2015 13:59:20 +0200
Subject: [PATCH 10/21] ArmPlatformPkg: PrePeiCore: write early hello message
@@ -73,10 +73,10 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
5 files changed, 15 insertions(+)
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
-index fb01dd1a113e..a6681c103297 100644
+index a5b4722459d1..ea7b220bc831 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
-@@ -69,6 +69,8 @@ [FixedPcd]
+@@ -66,6 +66,8 @@ [FixedPcd]
gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize
gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
@@ -86,10 +86,10 @@ index fb01dd1a113e..a6681c103297 100644
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase
gArmTokenSpaceGuid.PcdGicSgiIntId
diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
-index e9eb092d3ac9..c98dc82f0c66 100644
+index 466a2b01c384..29fb8737cb2f 100644
--- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
+++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
-@@ -67,4 +67,6 @@ [FixedPcd]
+@@ -64,4 +64,6 @@ [FixedPcd]
gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize
gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize
@@ -141,5 +141,5 @@ index 1c2580eb923b..2a7580dbb405 100644
// Adjust the Temporary Ram as the new Ppi List (Common + Platform Ppi Lists) is
created at
--
-2.35.1
+2.35.3
diff --git a/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch
b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch
index c4c046c..bdcf172 100644
--- a/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch
+++ b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch
@@ -1,4 +1,4 @@
-From aa5965f02de8c044106a413f817b6a2651e89e97 Mon Sep 17 00:00:00 2001
+From 01ac59a696ed46ab1444bc5e15de791c0d90bad5 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Wed, 14 Oct 2015 14:07:17 +0200
Subject: [PATCH 11/21] ArmVirtPkg: set early hello message (RH only)
@@ -66,7 +66,7 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
1 file changed, 1 insertion(+)
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
-index 6960df62b082..847a82ac52e6 100644
+index 7705bf391976..ae35cc18008d 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -134,6 +134,7 @@ [PcdsFeatureFlag.common]
@@ -78,5 +78,5 @@ index 6960df62b082..847a82ac52e6 100644
gArmTokenSpaceGuid.PcdVFPEnabled|1
!endif
--
-2.35.1
+2.35.3
diff --git a/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch
b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch
index e4374d0..5ef3750 100644
--- a/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch
+++ b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch
@@ -1,4 +1,4 @@
-From 68eb31a414bf2fc427cfa7831a90690dcb703c65 Mon Sep 17 00:00:00 2001
+From 9fcfbf51e0a342172f316ae709311b4a6365b673 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini(a)redhat.com>
Date: Tue, 21 Nov 2017 00:57:45 +0100
Subject: [PATCH 12/21] OvmfPkg: enable DEBUG_VERBOSE (RHEL only)
@@ -65,10 +65,10 @@ Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com>
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index d1f9bc6d0d61..538a0c77f671 100644
+index ae23094ffc27..ccc46c974b16 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -471,7 +471,7 @@ [PcdsFixedAtBuild]
+@@ -476,7 +476,7 @@ [PcdsFixedAtBuild]
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
# // significantly impact boot performance
# DEBUG_ERROR 0x80000000 // Error
@@ -78,10 +78,10 @@ index d1f9bc6d0d61..538a0c77f671 100644
!if $(SOURCE_DEBUG_ENABLE) == TRUE
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index 6bcd222af7c2..91a3c8f9dda6 100644
+index b69e3c05a281..bbe4e91037c2 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -520,7 +520,7 @@ [PcdsFixedAtBuild]
+@@ -525,7 +525,7 @@ [PcdsFixedAtBuild]
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
# // significantly impact boot performance
# DEBUG_ERROR 0x80000000 // Error
@@ -91,10 +91,10 @@ index 6bcd222af7c2..91a3c8f9dda6 100644
!if $(SOURCE_DEBUG_ENABLE) == TRUE
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 0cce3b768e12..1a7ba6e6eac5 100644
+index 726011ec42a5..072f06c0a3ab 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -524,7 +524,7 @@ [PcdsFixedAtBuild]
+@@ -531,7 +531,7 @@ [PcdsFixedAtBuild]
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
# // significantly impact boot performance
# DEBUG_ERROR 0x80000000 // Error
@@ -104,10 +104,10 @@ index 0cce3b768e12..1a7ba6e6eac5 100644
!if $(SOURCE_DEBUG_ENABLE) == TRUE
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 847cf6a46652..1a7afc764607 100644
+index ab2e31ea8f2b..46661408f97b 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -525,7 +525,7 @@ [PcdsFixedAtBuild]
+@@ -548,7 +548,7 @@ [PcdsFixedAtBuild]
# DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may
# // significantly impact boot performance
# DEBUG_ERROR 0x80000000 // Error
@@ -117,5 +117,5 @@ index 847cf6a46652..1a7afc764607 100644
!if $(SOURCE_DEBUG_ENABLE) == TRUE
gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17
--
-2.35.1
+2.35.3
diff --git a/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch
b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch
index b681445..c10ea96 100644
--- a/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch
+++ b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch
@@ -1,4 +1,4 @@
-From 4a93ff1fcac08c28bd3f70e9f5bb0e402c27cb43 Mon Sep 17 00:00:00 2001
+From f577d3719babf7d2cf3bd8f4a404007236e19125 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini(a)redhat.com>
Date: Tue, 21 Nov 2017 00:57:46 +0100
Subject: [PATCH 13/21] OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in
@@ -82,10 +82,10 @@ Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com>
4 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index 538a0c77f671..ea4070eedbde 100644
+index ccc46c974b16..c66ad3af1a23 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -715,8 +715,14 @@ [Components]
+@@ -726,8 +726,14 @@ [Components]
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
@@ -103,10 +103,10 @@ index 538a0c77f671..ea4070eedbde 100644
#
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index 91a3c8f9dda6..37d1d4b9a5e0 100644
+index bbe4e91037c2..b37a5a6da948 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -812,9 +812,15 @@ [Components]
+@@ -830,9 +830,15 @@ [Components]
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
!ifndef $(CSM_ENABLE)
@@ -125,10 +125,10 @@ index 91a3c8f9dda6..37d1d4b9a5e0 100644
#
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 1a7ba6e6eac5..948e1a5ba59c 100644
+index 072f06c0a3ab..b0e8c20e93d7 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -826,9 +826,15 @@ [Components.X64]
+@@ -844,9 +844,15 @@ [Components.X64]
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
!ifndef $(CSM_ENABLE)
@@ -147,10 +147,10 @@ index 1a7ba6e6eac5..948e1a5ba59c 100644
#
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 1a7afc764607..46799406b613 100644
+index 46661408f97b..6211d5e934de 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -823,9 +823,15 @@ [Components]
+@@ -909,9 +909,15 @@ [Components]
MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf
!ifndef $(CSM_ENABLE)
@@ -169,5 +169,5 @@ index 1a7afc764607..46799406b613 100644
#
--
-2.35.1
+2.35.3
diff --git a/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch
b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch
index 850d5d3..c8860f2 100644
--- a/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch
+++ b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch
@@ -1,4 +1,4 @@
-From 1a0949d47578b6f74e3ac70c479454307141c1b9 Mon Sep 17 00:00:00 2001
+From 4460b520c24a003b977dded58a0f62bf70a83c69 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Wed, 27 Jan 2016 03:05:18 +0100
Subject: [PATCH 14/21] ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in
@@ -61,10 +61,10 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
-index 847a82ac52e6..d94a8cdd696e 100644
+index ae35cc18008d..f30c1e622c30 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
-@@ -509,7 +509,10 @@ [Components.common]
+@@ -511,7 +511,10 @@ [Components.common]
#
# Video support
#
@@ -77,10 +77,10 @@ index 847a82ac52e6..d94a8cdd696e 100644
OvmfPkg/PlatformDxe/Platform.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
-index 36343f347bab..99189055d8bd 100644
+index 7f7d15d6eee3..14f7b29991bc 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
-@@ -438,7 +438,10 @@ [Components.common]
+@@ -440,7 +440,10 @@ [Components.common]
#
# Video support
#
@@ -93,5 +93,5 @@ index 36343f347bab..99189055d8bd 100644
OvmfPkg/PlatformDxe/Platform.inf
--
-2.35.1
+2.35.3
diff --git a/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch
b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch
index f289454..5d15a5f 100644
--- a/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch
+++ b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch
@@ -1,4 +1,4 @@
-From 9ee0430cff8d62256904063205d6c874cf949adf Mon Sep 17 00:00:00 2001
+From d64349e98dac4add2813971c7e9f44d837d87880 Mon Sep 17 00:00:00 2001
From: Philippe Mathieu-Daude <philmd(a)redhat.com>
Date: Thu, 1 Aug 2019 20:43:48 +0200
Subject: [PATCH 15/21] OvmfPkg: QemuRamfbDxe: Do not report DXE failure on
@@ -92,5 +92,5 @@ index f5113fbc78a6..0295986fe0f1 100644
}
--
-2.35.1
+2.35.3
diff --git a/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch
b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch
index 11b88c3..344cfb5 100644
--- a/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch
+++ b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch
@@ -1,4 +1,4 @@
-From a365d5f65506c2b8c993089ad5b77dac7c6f4296 Mon Sep 17 00:00:00 2001
+From 19a991fbfc8dd21a9ccff051da77c8651ee7aa14 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini(a)redhat.com>
Date: Tue, 21 Nov 2017 00:57:47 +0100
Subject: [PATCH 16/21] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in
@@ -63,10 +63,10 @@ Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com>
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
-index ea4070eedbde..b9718ff03f7b 100644
+index c66ad3af1a23..7df6e5c825d7 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
-@@ -709,7 +709,10 @@ [Components]
+@@ -720,7 +720,10 @@ [Components]
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
@@ -79,10 +79,10 @@ index ea4070eedbde..b9718ff03f7b 100644
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
-index 37d1d4b9a5e0..4dfd33853162 100644
+index b37a5a6da948..ed6a820d2e1d 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
-@@ -805,7 +805,10 @@ [Components]
+@@ -823,7 +823,10 @@ [Components]
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
@@ -95,10 +95,10 @@ index 37d1d4b9a5e0..4dfd33853162 100644
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
-index 948e1a5ba59c..63721e5d177e 100644
+index b0e8c20e93d7..b5be86cff32c 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
-@@ -819,7 +819,10 @@ [Components.X64]
+@@ -837,7 +837,10 @@ [Components.X64]
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
@@ -111,10 +111,10 @@ index 948e1a5ba59c..63721e5d177e 100644
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
-index 46799406b613..cac0391c0807 100644
+index 6211d5e934de..29b45e68e387 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
-@@ -816,7 +816,10 @@ [Components]
+@@ -902,7 +902,10 @@ [Components]
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
@@ -127,5 +127,5 @@ index 46799406b613..cac0391c0807 100644
MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf
--
-2.35.1
+2.35.3
diff --git a/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
index 0d76682..295993e 100644
--- a/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
+++ b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch
@@ -1,4 +1,4 @@
-From 5a952392dd42f4f041f2c8e9e8aaf7df1d654639 Mon Sep 17 00:00:00 2001
+From 85896a30011c3db49aa377c80e0ea81b7d8005f9 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Sat, 16 Nov 2019 17:11:27 +0100
Subject: [PATCH 17/21] CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files
@@ -131,10 +131,10 @@ Signed-off-by: Laszlo Ersek <lersek(a)redhat.com>
2 files changed, 22 insertions(+)
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
-index d84bde056af2..19913a4ac617 100644
+index c899b811b149..4a89dc82b65e 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf
-@@ -570,6 +570,17 @@ [Sources]
+@@ -620,6 +620,17 @@ [Sources]
$(OPENSSL_PATH)/ssl/statem/statem.h
$(OPENSSL_PATH)/ssl/statem/statem_local.h
# Autogenerated files list ends here
@@ -153,10 +153,10 @@ index d84bde056af2..19913a4ac617 100644
ossl_store.c
rand_pool.c
diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
-index cdeed0d073eb..5057857e8d89 100644
+index 0ec372454119..f1cc0aaf9fda 100644
--- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
+++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf
-@@ -519,6 +519,17 @@ [Sources]
+@@ -569,6 +569,17 @@ [Sources]
$(OPENSSL_PATH)/crypto/x509v3/standard_exts.h
$(OPENSSL_PATH)/crypto/x509v3/v3_admis.h
# Autogenerated files list ends here
@@ -175,5 +175,5 @@ index cdeed0d073eb..5057857e8d89 100644
ossl_store.c
rand_pool.c
--
-2.35.1
+2.35.3
diff --git a/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch
b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch
index 4cbbf3b..af8d0bb 100644
--- a/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch
+++ b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch
@@ -1,4 +1,4 @@
-From c36a16dad384129382088ef783d8e672ead2752a Mon Sep 17 00:00:00 2001
+From 98e14a58d727bb2d863a7a8c3a257f3b02b15b80 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Wed, 24 Jun 2020 11:31:36 +0200
Subject: [PATCH 18/21] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no
@@ -80,5 +80,5 @@ index d4f3cd92255f..f007f8a6c233 100644
}
--
-2.35.1
+2.35.3
diff --git a/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch
b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch
index eb80d57..d21cd95 100644
--- a/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch
+++ b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch
@@ -1,4 +1,4 @@
-From bee2e929ef342eafbe44f0471154da4270cac91d Mon Sep 17 00:00:00 2001
+From ee4dd84fe0d33568b1800f5d6840627103c46d8d Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek(a)redhat.com>
Date: Wed, 24 Jun 2020 11:40:09 +0200
Subject: [PATCH 19/21] SecurityPkg/Tcg2Dxe: suppress error on no swtpm in
@@ -78,5 +78,5 @@ index f6ea8b2bbf18..681eb7e08b98 100644
}
--
-2.35.1
+2.35.3
diff --git a/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch
b/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch
index bf41586..3526dcf 100644
--- a/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch
+++ b/0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch
@@ -1,4 +1,4 @@
-From b0f070f4bf317f899de1b20a122ca124ad900d80 Mon Sep 17 00:00:00 2001
+From 74b3fd529e1b49dbe1ede576d23771d4f071d338 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Thu, 2 Dec 2021 14:06:18 +0100
Subject: [PATCH 20/21] OvmfPkg/Microvm: take PcdResizeXterm from the QEMU
@@ -9,17 +9,17 @@ Subject: [PATCH 20/21] OvmfPkg/Microvm: take PcdResizeXterm from the
QEMU
1 file changed, 1 insertion(+)
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
-index 1ea43443ae97..073ff040a28a 100644
+index 4e5ab89c8f0d..e1a7e6cb77a9 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
-@@ -551,6 +551,7 @@ [PcdsDynamicDefault]
+@@ -556,6 +556,7 @@ [PcdsDynamicDefault]
# only set when
# ($(SMM_REQUIRE) == FALSE)
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
- gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0
--
-2.35.1
+2.35.3
diff --git a/0021-Tweak-the-tools_def-to-support-cross-compiling.patch
b/0021-Tweak-the-tools_def-to-support-cross-compiling.patch
index 5c1ee18..60fe752 100644
--- a/0021-Tweak-the-tools_def-to-support-cross-compiling.patch
+++ b/0021-Tweak-the-tools_def-to-support-cross-compiling.patch
@@ -1,4 +1,4 @@
-From 7aa9291cca4a5d3e499081741ae1bff1c2ebe2e9 Mon Sep 17 00:00:00 2001
+From 6b2ca6f01bb76a3b9632e902b4bf0ef9e912ce40 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini(a)redhat.com>
Date: Thu, 16 Aug 2018 15:45:47 -0400
Subject: [PATCH 21/21] Tweak the tools_def to support cross-compiling.
@@ -12,10 +12,10 @@ Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
-index 9c310cf23d25..3189a3958b53 100755
+index 5ed19810b727..5901d9eecb5d 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
-@@ -2299,17 +2299,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
+@@ -2280,17 +2280,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20
##################
# GCC5 IA32 definitions
##################
@@ -44,7 +44,7 @@ index 9c310cf23d25..3189a3958b53 100755
*_GCC5_IA32_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m32
*_GCC5_IA32_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_i386
-no-pie
-@@ -2331,17 +2331,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS)
-flto -Os -Wl,
+@@ -2312,17 +2312,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS)
-flto -Os -Wl,
##################
# GCC5 X64 definitions
##################
@@ -74,5 +74,5 @@ index 9c310cf23d25..3189a3958b53 100755
*_GCC5_X64_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m64
*_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64
--
-2.35.1
+2.35.3
commit 2e3c3cc63288e9d03b8beea567abcc77d900879f
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Mon May 30 11:43:11 2022 +0200
drop gcc12 fixes
merged upstream
diff --git a/0030-BaseTools-fix-gcc12-warning.patch
b/0030-BaseTools-fix-gcc12-warning.patch
deleted file mode 100644
index ff687cd..0000000
--- a/0030-BaseTools-fix-gcc12-warning.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 84d64059dd0082609a43c7938a8a35e10da10706 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel(a)redhat.com>
-Date: Mon, 24 Jan 2022 11:03:25 +0100
-Subject: [PATCH 30/32] BaseTools: fix gcc12 warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GenFfs.c:545:5: error: pointer ‘InFileHandle’ used after ‘fclose’
[-Werror=use-after-free]
- 545 | Error(NULL, 0, 4001, "Resource", "memory cannot be allocated
of %s", InFileHandle);
- |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-GenFfs.c:544:5: note: call to ‘fclose’ here
- 544 | fclose (InFileHandle);
- | ^~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
----
- BaseTools/Source/C/GenFfs/GenFfs.c | 2 +-
- BaseTools/Source/C/GenSec/GenSec.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
-index 949025c33325..d78d62ab3689 100644
---- a/BaseTools/Source/C/GenFfs/GenFfs.c
-+++ b/BaseTools/Source/C/GenFfs/GenFfs.c
-@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
- PeFileBuffer = (UINT8 *) malloc (PeFileSize);
- if (PeFileBuffer == NULL) {
- fclose (InFileHandle);
-- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of
%s", InFileHandle);
-+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for
%s", InFile);
- return EFI_OUT_OF_RESOURCES;
- }
- fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
-diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
-index d54a4f9e0a7d..b1d05367ec0b 100644
---- a/BaseTools/Source/C/GenSec/GenSec.c
-+++ b/BaseTools/Source/C/GenSec/GenSec.c
-@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
- PeFileBuffer = (UINT8 *) malloc (PeFileSize);
- if (PeFileBuffer == NULL) {
- fclose (InFileHandle);
-- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of
%s", InFileHandle);
-+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for
%s", InFile);
- return EFI_OUT_OF_RESOURCES;
- }
- fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
---
-2.35.1
-
diff --git a/0031-BaseTools-fix-gcc12-warning.patch
b/0031-BaseTools-fix-gcc12-warning.patch
deleted file mode 100644
index c6cd39d..0000000
--- a/0031-BaseTools-fix-gcc12-warning.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c537b93adc2dc2243c6e53dfbbe8cd10fb073b7a Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel(a)redhat.com>
-Date: Mon, 24 Jan 2022 11:04:55 +0100
-Subject: [PATCH 31/32] BaseTools: fix gcc12 warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Sdk/C/LzmaEnc.c: In function ‘LzmaEnc_CodeOneMemBlock’:
-Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ‘outStream’ in
‘*p.rc.outStream’ [-Werror=dangling-pointer=]
- 2828 | p->rc.outStream = &outStream.vt;
- | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
-Sdk/C/LzmaEnc.c:2811:28: note: ‘outStream’ declared here
- 2811 | CLzmaEnc_SeqOutStreamBuf outStream;
- | ^~~~~~~~~
-Sdk/C/LzmaEnc.c:2811:28: note: ‘pp’ declared here
-Sdk/C/LzmaEnc.c:2828:19: error: storing the address of local variable ‘outStream’ in
‘*(CLzmaEnc *)pp.rc.outStream’ [-Werror=dangling-pointer=]
- 2828 | p->rc.outStream = &outStream.vt;
- | ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
-Sdk/C/LzmaEnc.c:2811:28: note: ‘outStream’ declared here
- 2811 | CLzmaEnc_SeqOutStreamBuf outStream;
- | ^~~~~~~~~
-Sdk/C/LzmaEnc.c:2811:28: note: ‘pp’ declared here
-cc1: all warnings being treated as errors
-
-Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
----
- BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
-index 4e9b499f8d80..4b9f5fa69248 100644
---- a/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
-+++ b/BaseTools/Source/C/LzmaCompress/Sdk/C/LzmaEnc.c
-@@ -2825,12 +2825,13 @@ SRes LzmaEnc_CodeOneMemBlock(CLzmaEncHandle pp, BoolInt reInit,
-
- nowPos64 = p->nowPos64;
- RangeEnc_Init(&p->rc);
-- p->rc.outStream = &outStream.vt;
-
- if (desiredPackSize == 0)
- return SZ_ERROR_OUTPUT_EOF;
-
-+ p->rc.outStream = &outStream.vt;
- res = LzmaEnc_CodeOneBlock(p, desiredPackSize, *unpackSize);
-+ p->rc.outStream = NULL;
-
- *unpackSize = (UInt32)(p->nowPos64 - nowPos64);
- *destLen -= outStream.rem;
---
-2.35.1
-
diff --git a/0032-Basetools-turn-off-gcc12-warning.patch
b/0032-Basetools-turn-off-gcc12-warning.patch
deleted file mode 100644
index bfa7560..0000000
--- a/0032-Basetools-turn-off-gcc12-warning.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 15e8ff0438387a1737f136ab8f1ad513cfb52993 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel(a)redhat.com>
-Date: Thu, 24 Mar 2022 10:28:45 +0100
-Subject: [PATCH 32/32] Basetools: turn off gcc12 warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In function ‘SetDevicePathEndNode’,
- inlined from ‘FileDevicePath’ at DevicePathUtilities.c:857:5:
-DevicePathUtilities.c:321:3: error: writing 4 bytes into a region of size 1
[-Werror=stringop-overflow=]
- 321 | memcpy (Node, &mUefiDevicePathLibEndDevicePath, sizeof
(mUefiDevicePathLibEndDevicePath));
- |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-In file included from UefiDevicePathLib.h:22,
- from DevicePathUtilities.c:16:
-../Include/Protocol/DevicePath.h: In function ‘FileDevicePath’:
-../Include/Protocol/DevicePath.h:51:9: note: destination object ‘Type’ of size 1
- 51 | UINT8 Type; ///< 0x01 Hardware Device Path.
- | ^~~~
-
-Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com>
----
- BaseTools/Source/C/DevicePath/GNUmakefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/BaseTools/Source/C/DevicePath/GNUmakefile
b/BaseTools/Source/C/DevicePath/GNUmakefile
-index 7ca08af9662d..b05d2bddfa68 100644
---- a/BaseTools/Source/C/DevicePath/GNUmakefile
-+++ b/BaseTools/Source/C/DevicePath/GNUmakefile
-@@ -13,6 +13,9 @@ OBJECTS = DevicePath.o UefiDevicePathLib.o DevicePathFromText.o
DevicePathUtili
-
- include $(MAKEROOT)/Makefiles/app.makefile
-
-+# gcc 12 trips over device path handling
-+BUILD_CFLAGS += -Wno-error=stringop-overflow
-+
- LIBS = -lCommon
- ifeq ($(CYGWIN), CYGWIN)
- LIBS += -L/lib/e2fsprogs -luuid
---
-2.35.1
-
diff --git a/edk2.spec b/edk2.spec
index f400194..bf1376a 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -93,9 +93,9 @@ Patch0019:
0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch
Patch0020: 0020-OvmfPkg-Microvm-take-PcdResizeXterm-from-the-QEMU-co.patch
Patch0021: 0021-Tweak-the-tools_def-to-support-cross-compiling.patch
-Patch0030: 0030-BaseTools-fix-gcc12-warning.patch
-Patch0031: 0031-BaseTools-fix-gcc12-warning.patch
-Patch0032: 0032-Basetools-turn-off-gcc12-warning.patch
+#Patch0030: 0030-BaseTools-fix-gcc12-warning.patch
+#Patch0031: 0031-BaseTools-fix-gcc12-warning.patch
+#Patch0032: 0032-Basetools-turn-off-gcc12-warning.patch
# python3-devel and libuuid-devel are required for building tools.
# python3-devel is also needed for varstore template generation and
commit e7d072730116c64d901054b1f3568abbc890933e
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Wed May 25 13:38:28 2022 +0200
update to new edk2 stable tag
diff --git a/edk2.spec b/edk2.spec
index dac8936..f400194 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -8,9 +8,9 @@
# (such as ppc), so lets limit things to the known-good ones.
ExclusiveArch: x86_64 aarch64
-# edk2-stable202202
-%define GITDATE 20220221
-%define GITCOMMIT b24306f15daa
+# edk2-stable202205
+%define GITDATE 20220526
+%define GITCOMMIT 16779ede2d36
%define TOOLCHAIN GCC5
%define OPENSSL_VER 1.1.1k
@@ -40,7 +40,7 @@ ExclusiveArch: x86_64 aarch64
Name: edk2
Version: %{GITDATE}git%{GITCOMMIT}
-Release: 4%{?dist}
+Release: 1%{?dist}
Summary: UEFI firmware for 64-bit virtual machines
License: BSD-2-Clause-Patent and OpenSSL and MIT
URL:
http://www.tianocore.org
diff --git a/sources b/sources
index 5601f16..6b275ac 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (softfloat-20180726-gitb64af41.tar.xz) =
f079debd1bfcc0fe64329a8947b0689ef49246793edcdd28a2879f6550c652b0cf0f53ac4f6f5ab61ac4f7933972e0019d0ab63eb9931b6884c2909f3a5ead30
SHA512 (openssl-rhel-bdd048e929dcfcf2f046d74e812e0e3d5fc58504.tar.xz) =
d6c0be28cefaa7993f479aecf45f5523e10aab388a92c3e4add55d6ff8483cc01fba367be62f6e9a23bfad7b46986befd3eca0d0e89b984049719645e37d52df
-SHA512 (edk2-b24306f15daa.tar.xz) =
f05b558818b873ac65804b9d57f32f3ecbe2d1a450acad15ec34a083c600374f01ed1f874055dbef7aa95c6b22639552cc2d01e915d8016d5aa9437bde10c6b6
+SHA512 (edk2-16779ede2d36.tar.xz) =
ab4fe5208506d93796db45cdcc63b95d99ebeb34e4783ede9b4bb411befe0dd09adf64b2cdf390180bc5c007ac5cde3b9692d4bf4c536261631ecccf0e2778c9