rebase to edk2-stable202111
Two patches need a refresh (context changes). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
11416716fe
commit
5eb552e5ee
|
@ -1,7 +1,12 @@
|
||||||
From 1165bbcec94a97cf1d1509df8210feb2e1db00c5 Mon Sep 17 00:00:00 2001
|
From cbfd81c5bdd8bb8ee49f4e3387226cdcb83e6fb3 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
Date: Wed, 14 Oct 2015 15:59:06 +0200
|
||||||
Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only)
|
Subject: [PATCH 07/20] OvmfPkg: take PcdResizeXterm from the QEMU command line
|
||||||
|
(RH only)
|
||||||
|
|
||||||
|
edk2-stable202108 rebase
|
||||||
|
|
||||||
|
- resolve conflict in OvmfPkg/PlatformPei/PlatformPei.inf
|
||||||
|
|
||||||
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
|
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
|
||||||
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
|
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
|
||||||
|
@ -70,15 +75,15 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
OvmfPkg/OvmfPkgIa32.dsc | 1 +
|
||||||
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
OvmfPkg/OvmfPkgIa32X64.dsc | 1 +
|
||||||
OvmfPkg/OvmfPkgX64.dsc | 1 +
|
OvmfPkg/OvmfPkgX64.dsc | 1 +
|
||||||
OvmfPkg/PlatformPei/Platform.c | 1 +
|
|
||||||
OvmfPkg/PlatformPei/PlatformPei.inf | 1 +
|
OvmfPkg/PlatformPei/PlatformPei.inf | 1 +
|
||||||
|
OvmfPkg/PlatformPei/Platform.c | 1 +
|
||||||
6 files changed, 6 insertions(+)
|
6 files changed, 6 insertions(+)
|
||||||
|
|
||||||
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||||
index 52bcae6cf6..0a8cb7fd3b 100644
|
index e589eafa49a8..e2aba82718c8 100644
|
||||||
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||||
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||||||
@@ -534,6 +534,7 @@
|
@@ -534,6 +534,7 @@ [PcdsFixedAtBuild]
|
||||||
[PcdsDynamicDefault]
|
[PcdsDynamicDefault]
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||||
|
|
||||||
|
@ -87,10 +92,10 @@ index 52bcae6cf6..0a8cb7fd3b 100644
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
index d8f03caa30..e6df324c7c 100644
|
index 5ccdd55472cc..9bde8702e74b 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||||||
@@ -594,6 +594,7 @@
|
@@ -594,6 +594,7 @@ [PcdsDynamicDefault]
|
||||||
# ($(SMM_REQUIRE) == FALSE)
|
# ($(SMM_REQUIRE) == FALSE)
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||||
|
|
||||||
|
@ -99,10 +104,10 @@ index d8f03caa30..e6df324c7c 100644
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||||
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
index 312577ebae..8104fe0218 100644
|
index 9862112601f2..7ee5eaa0ace7 100644
|
||||||
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||||||
@@ -600,6 +600,7 @@
|
@@ -600,6 +600,7 @@ [PcdsDynamicDefault]
|
||||||
# ($(SMM_REQUIRE) == FALSE)
|
# ($(SMM_REQUIRE) == FALSE)
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||||
|
|
||||||
|
@ -111,10 +116,10 @@ index 312577ebae..8104fe0218 100644
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||||
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
index d72a00e6b4..3c8b2649a8 100644
|
index a6ba816d2fb5..ec8df8397ed4 100644
|
||||||
--- a/OvmfPkg/OvmfPkgX64.dsc
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||||||
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||||||
@@ -600,6 +600,7 @@
|
@@ -600,6 +600,7 @@ [PcdsDynamicDefault]
|
||||||
# ($(SMM_REQUIRE) == FALSE)
|
# ($(SMM_REQUIRE) == FALSE)
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0
|
||||||
|
|
||||||
|
@ -122,11 +127,23 @@ index d72a00e6b4..3c8b2649a8 100644
|
||||||
!if $(SMM_REQUIRE) == FALSE
|
!if $(SMM_REQUIRE) == FALSE
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0
|
||||||
|
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||||
|
index 89d1f7636870..655240c6436e 100644
|
||||||
|
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||||
|
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
||||||
|
@@ -93,6 +93,7 @@ [Pcd]
|
||||||
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
|
||||||
|
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
||||||
|
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
||||||
|
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
||||||
|
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
||||||
|
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
||||||
|
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|
||||||
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
|
||||||
index 96468701e3..14efbabe39 100644
|
index d3a20122a2ea..9a40932156a3 100644
|
||||||
--- a/OvmfPkg/PlatformPei/Platform.c
|
--- a/OvmfPkg/PlatformPei/Platform.c
|
||||||
+++ b/OvmfPkg/PlatformPei/Platform.c
|
+++ b/OvmfPkg/PlatformPei/Platform.c
|
||||||
@@ -748,6 +748,7 @@ InitializePlatform (
|
@@ -738,6 +738,7 @@ InitializePlatform (
|
||||||
MemTypeInfoInitialization ();
|
MemTypeInfoInitialization ();
|
||||||
MemMapInitialization ();
|
MemMapInitialization ();
|
||||||
NoexecDxeInitialization ();
|
NoexecDxeInitialization ();
|
||||||
|
@ -134,18 +151,6 @@ index 96468701e3..14efbabe39 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
InstallClearCacheCallback ();
|
InstallClearCacheCallback ();
|
||||||
diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
||||||
index 6ef77ba7bb..22425d34c0 100644
|
|
||||||
--- a/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
||||||
+++ b/OvmfPkg/PlatformPei/PlatformPei.inf
|
|
||||||
@@ -97,6 +97,7 @@
|
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
|
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
|
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration
|
|
||||||
+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm
|
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
|
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
|
|
||||||
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack
|
|
||||||
--
|
--
|
||||||
2.27.0
|
2.33.1
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
From 29be717a1ae0a2617a7ae95698940286201d1612 Mon Sep 17 00:00:00 2001
|
From 11a79ac24d7411c8ad9d8a6779b324c5164e06d0 Mon Sep 17 00:00:00 2001
|
||||||
From: Laszlo Ersek <lersek@redhat.com>
|
From: Laszlo Ersek <lersek@redhat.com>
|
||||||
Date: Wed, 24 Jun 2020 11:31:36 +0200
|
Date: Wed, 24 Jun 2020 11:31:36 +0200
|
||||||
Subject: OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" in
|
Subject: [PATCH 19/20] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no
|
||||||
silent aa64 build (RH)
|
"-kernel" in silent aa64 build (RH)
|
||||||
|
|
||||||
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
|
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
|
||||||
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
|
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
|
||||||
|
@ -27,23 +27,35 @@ Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
||||||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||||||
(cherry picked from commit 9adcdf493ebbd11efb74e2905ab5f6c8996e096d)
|
(cherry picked from commit 9adcdf493ebbd11efb74e2905ab5f6c8996e096d)
|
||||||
---
|
---
|
||||||
.../QemuKernelLoaderFsDxe.c | 17 +++++++++++++++++
|
|
||||||
.../QemuKernelLoaderFsDxe.inf | 1 +
|
.../QemuKernelLoaderFsDxe.inf | 1 +
|
||||||
|
.../QemuKernelLoaderFsDxe.c | 17 +++++++++++++++++
|
||||||
2 files changed, 18 insertions(+)
|
2 files changed, 18 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
||||||
|
index 7b35adb8e034..e0331c6e2cbc 100644
|
||||||
|
--- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
||||||
|
+++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
||||||
|
@@ -28,6 +28,7 @@ [LibraryClasses]
|
||||||
|
BaseLib
|
||||||
|
BaseMemoryLib
|
||||||
|
DebugLib
|
||||||
|
+ DebugPrintErrorLevelLib
|
||||||
|
DevicePathLib
|
||||||
|
MemoryAllocationLib
|
||||||
|
QemuFwCfgLib
|
||||||
diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
||||||
index b09ff6a359..ec0244d61b 100644
|
index 6832d563bcb0..08ed67f5ffea 100644
|
||||||
--- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
--- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
||||||
+++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
+++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c
|
||||||
@@ -18,6 +18,7 @@
|
@@ -19,6 +19,7 @@
|
||||||
#include <Library/BaseLib.h>
|
|
||||||
#include <Library/BaseMemoryLib.h>
|
#include <Library/BaseMemoryLib.h>
|
||||||
|
#include <Library/BlobVerifierLib.h>
|
||||||
#include <Library/DebugLib.h>
|
#include <Library/DebugLib.h>
|
||||||
+#include <Library/DebugPrintErrorLevelLib.h>
|
+#include <Library/DebugPrintErrorLevelLib.h>
|
||||||
#include <Library/DevicePathLib.h>
|
#include <Library/DevicePathLib.h>
|
||||||
#include <Library/MemoryAllocationLib.h>
|
#include <Library/MemoryAllocationLib.h>
|
||||||
#include <Library/QemuFwCfgLib.h>
|
#include <Library/QemuFwCfgLib.h>
|
||||||
@@ -1039,6 +1040,22 @@ QemuKernelLoaderFsDxeEntrypoint (
|
@@ -1054,6 +1055,22 @@ QemuKernelLoaderFsDxeEntrypoint (
|
||||||
|
|
||||||
if (KernelBlob->Data == NULL) {
|
if (KernelBlob->Data == NULL) {
|
||||||
Status = EFI_NOT_FOUND;
|
Status = EFI_NOT_FOUND;
|
||||||
|
@ -66,18 +78,6 @@ index b09ff6a359..ec0244d61b 100644
|
||||||
goto FreeBlobs;
|
goto FreeBlobs;
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
|
||||||
index 7b35adb8e0..e0331c6e2c 100644
|
|
||||||
--- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
|
||||||
+++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf
|
|
||||||
@@ -28,6 +28,7 @@
|
|
||||||
BaseLib
|
|
||||||
BaseMemoryLib
|
|
||||||
DebugLib
|
|
||||||
+ DebugPrintErrorLevelLib
|
|
||||||
DevicePathLib
|
|
||||||
MemoryAllocationLib
|
|
||||||
QemuFwCfgLib
|
|
||||||
--
|
--
|
||||||
2.27.0
|
2.33.1
|
||||||
|
|
||||||
|
|
14
edk2.spec
14
edk2.spec
|
@ -8,8 +8,9 @@ ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
|
||||||
ExclusiveArch: x86_64 aarch64
|
ExclusiveArch: x86_64 aarch64
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define GITDATE 20210527
|
# edk2-stable202111
|
||||||
%define GITCOMMIT e1999b264f1f
|
%define GITDATE 20211126
|
||||||
|
%define GITCOMMIT bb1bba3d7767
|
||||||
%define TOOLCHAIN GCC5
|
%define TOOLCHAIN GCC5
|
||||||
%define OPENSSL_VER 1.1.1k
|
%define OPENSSL_VER 1.1.1k
|
||||||
|
|
||||||
|
@ -47,13 +48,13 @@ ExclusiveArch: x86_64 aarch64
|
||||||
|
|
||||||
Name: edk2
|
Name: edk2
|
||||||
Version: %{GITDATE}git%{GITCOMMIT}
|
Version: %{GITDATE}git%{GITCOMMIT}
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: UEFI firmware for 64-bit virtual machines
|
Summary: UEFI firmware for 64-bit virtual machines
|
||||||
License: BSD-2-Clause-Patent and OpenSSL and MIT
|
License: BSD-2-Clause-Patent and OpenSSL and MIT
|
||||||
URL: http://www.tianocore.org
|
URL: http://www.tianocore.org
|
||||||
|
|
||||||
# The source tarball is created using following commands:
|
# The source tarball is created using following commands:
|
||||||
# COMMIT=e1999b264f1f
|
# COMMIT=bb1bba3d7767
|
||||||
# git archive --format=tar --prefix=edk2-$COMMIT/ $COMMIT \
|
# git archive --format=tar --prefix=edk2-$COMMIT/ $COMMIT \
|
||||||
# | xz -9ev >/tmp/edk2-$COMMIT.tar.xz
|
# | xz -9ev >/tmp/edk2-$COMMIT.tar.xz
|
||||||
Source0: edk2-%{GITCOMMIT}.tar.xz
|
Source0: edk2-%{GITCOMMIT}.tar.xz
|
||||||
|
@ -742,6 +743,11 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$')
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 6 2021 Gerd Hoffmann <kraxel@redhat.com> - 20211126gitbb1bba3d7767-1
|
||||||
|
- Update to edk2-stable202111
|
||||||
|
- Resolves rhbz#1978966
|
||||||
|
- Resolves rhbz#2026744
|
||||||
|
|
||||||
* Mon Dec 6 2021 Daniel P. Berrangé <berrange@redhat.com> - 20210527gite1999b264f1f-5
|
* Mon Dec 6 2021 Daniel P. Berrangé <berrange@redhat.com> - 20210527gite1999b264f1f-5
|
||||||
- Drop glibc strcmp workaround
|
- Drop glibc strcmp workaround
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue