From b846ca0e27e837984f5a8604942a4b27cdf65ba8 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mar 15 2019 19:50:22 +0000 Subject: Update to stable-201903 Update to openssl-1.1.0j Move to python3 deps --- diff --git a/.gitignore b/.gitignore index b2be7fd..1a61eb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /openssl-*-hobbled.tar.xz /edk2-*.tar.xz /qemu-ovmf-secureboot-*.tar.gz +/edk2-edk2-stable201903.tar.gz diff --git a/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index 5d4d06a..f9b0326 100644 --- a/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0001-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -1,4 +1,4 @@ -From 37942481c89eca732239c23fe606680e6e3faf77 Mon Sep 17 00:00:00 2001 +From 69da45eedaef8b6a02a0c77933330bcb0ec137e8 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe @@ -16,10 +16,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index a28b511d5c..7f725ab198 100644 +index 5b885590b2..3f77f78a68 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -738,7 +738,10 @@ +@@ -739,7 +739,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -32,10 +32,10 @@ index a28b511d5c..7f725ab198 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 115d0c01ff..d444a84267 100644 +index bbf0853ee6..3fb003e670 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -747,7 +747,10 @@ +@@ -748,7 +748,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -48,10 +48,10 @@ index 115d0c01ff..d444a84267 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 362eb789c7..f4e072870c 100644 +index d81460f520..26bbfecddf 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -745,7 +745,10 @@ +@@ -746,7 +746,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf diff --git a/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch b/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch index 9264deb..6401920 100644 --- a/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch +++ b/0002-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-the-DXE-.patch @@ -1,4 +1,4 @@ -From 5e55066b33d894cb7e9b84179de449e8734cb57d Mon Sep 17 00:00:00 2001 +From 98991ce22e7347461a3f5a912a1f885776ace4cf Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in the DXE core @@ -17,10 +17,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 6 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 7f725ab198..83e47281ed 100644 +index 3f77f78a68..89d380b72a 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -644,6 +644,8 @@ +@@ -645,6 +645,8 @@ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -30,10 +30,10 @@ index 7f725ab198..83e47281ed 100644 MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index d444a84267..a2adacfbd3 100644 +index 3fb003e670..e87d840a0c 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -653,6 +653,8 @@ +@@ -654,6 +654,8 @@ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf @@ -43,10 +43,10 @@ index d444a84267..a2adacfbd3 100644 MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index f4e072870c..b57e32f432 100644 +index 26bbfecddf..d6df5771e6 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -651,6 +651,8 @@ +@@ -652,6 +652,8 @@ NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf diff --git a/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch b/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch index 776d50b..be68aa0 100644 --- a/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch +++ b/0003-OvmfPkg-enable-DEBUG_VERBOSE.patch @@ -1,4 +1,4 @@ -From c667557c191923e981b972b5679fc49cec60d7e5 Mon Sep 17 00:00:00 2001 +From ec976161fc60922a53106f2aa3d17a2b5f7f577c Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 8 Jul 2012 14:26:07 +0200 Subject: [PATCH] OvmfPkg: enable DEBUG_VERBOSE @@ -14,10 +14,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 83e47281ed..cd0e71869b 100644 +index 89d380b72a..453b3563ab 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -486,7 +486,7 @@ +@@ -484,7 +484,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -27,10 +27,10 @@ index 83e47281ed..cd0e71869b 100644 !ifdef $(SOURCE_DEBUG_ENABLE) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index a2adacfbd3..7f7a78f60a 100644 +index e87d840a0c..41ff89c3db 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -491,7 +491,7 @@ +@@ -489,7 +489,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -40,10 +40,10 @@ index a2adacfbd3..7f7a78f60a 100644 !ifdef $(SOURCE_DEBUG_ENABLE) gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index b57e32f432..739807efc4 100644 +index d6df5771e6..c12a90a83c 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -491,7 +491,7 @@ +@@ -489,7 +489,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error diff --git a/0004-OvmfPkg-increase-max-debug-message-length-to-512.patch b/0004-OvmfPkg-increase-max-debug-message-length-to-512.patch index bedec89..a1ddd5b 100644 --- a/0004-OvmfPkg-increase-max-debug-message-length-to-512.patch +++ b/0004-OvmfPkg-increase-max-debug-message-length-to-512.patch @@ -1,4 +1,4 @@ -From 6324a2a8ae4fc96c9e13d39483c5ee0cb1fff619 Mon Sep 17 00:00:00 2001 +From 4baed0985163d9b34a55e97905da77660f6dc118 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 20 Feb 2014 22:54:45 +0100 Subject: [PATCH] OvmfPkg: increase max debug message length to 512 diff --git a/0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch b/0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch index 7b26aef..d4bafdc 100644 --- a/0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch +++ b/0005-advertise-OpenSSL-on-TianoCore-splash-screen-boot-lo.patch @@ -1,4 +1,4 @@ -From ade02daad705e1a4fd6468136de8fcb886f202a2 Mon Sep 17 00:00:00 2001 +From 2f0378ed75fd17e9ddd4e15b475197f6c6147b6c Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 11 Jun 2014 23:33:33 +0200 Subject: [PATCH] advertise OpenSSL on TianoCore splash screen / boot logo @@ -113,10 +113,10 @@ Signed-off-by: Paolo Bonzini create mode 100644 MdeModulePkg/Logo/LogoOpenSSLDxe.uni diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 885c6b14b8..a7a3899560 100644 +index a77d71bcea..319254f0db 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -327,7 +327,11 @@ +@@ -347,7 +347,11 @@ MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -129,10 +129,10 @@ index 885c6b14b8..a7a3899560 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index a6390bd4b8..20a5bcb27b 100644 +index 098d40b61b..514759a637 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -202,7 +202,11 @@ READ_LOCK_STATUS = TRUE +@@ -203,7 +203,11 @@ READ_LOCK_STATUS = TRUE # # TianoCore logo (splash screen) # @@ -145,10 +145,10 @@ index a6390bd4b8..20a5bcb27b 100644 # # Ramdisk support diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 434d6861a5..6e4e0249ef 100644 +index 1e5388ae70..daa8ee7009 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -316,7 +316,11 @@ +@@ -331,7 +331,11 @@ MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -3026,10 +3026,10 @@ index 0000000000..7227ac3910 +#string STR_MODULE_DESCRIPTION #language en-US "This module provides the logo bitmap picture (with OpenSSL advertisment) shown on setup screen, through EDKII Platform Logo protocol." + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index cd0e71869b..0a49336c0d 100644 +index 453b3563ab..5dd44bceb7 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -694,7 +694,11 @@ +@@ -695,7 +695,11 @@ NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf !endif } @@ -3042,12 +3042,12 @@ index cd0e71869b..0a49336c0d 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 52b8b1fea1..4177379a23 100644 +index 4999403ad7..77d0d3f131 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -295,7 +295,11 @@ INF ShellPkg/Application/Shell/Shell.inf - INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf +@@ -293,7 +293,11 @@ INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif + INF ShellPkg/Application/Shell/Shell.inf +!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) +INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf @@ -3058,10 +3058,10 @@ index 52b8b1fea1..4177379a23 100644 # # Network modules diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 7f7a78f60a..a3d51ef0f7 100644 +index 41ff89c3db..9a14a26845 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -703,7 +703,11 @@ +@@ -704,7 +704,11 @@ NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf !endif } @@ -3074,12 +3074,12 @@ index 7f7a78f60a..a3d51ef0f7 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 70845d6972..5e57161154 100644 +index d0cc107928..da68440ddb 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -296,7 +296,11 @@ INF ShellPkg/Application/Shell/Shell.inf - INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf +@@ -294,7 +294,11 @@ INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif + INF ShellPkg/Application/Shell/Shell.inf +!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) +INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf @@ -3090,10 +3090,10 @@ index 70845d6972..5e57161154 100644 # # Network modules diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 739807efc4..f9b4ab4dfa 100644 +index c12a90a83c..0f888b0373 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -701,7 +701,11 @@ +@@ -702,7 +702,11 @@ NULL|IntelFrameworkModulePkg/Library/LegacyBootManagerLib/LegacyBootManagerLib.inf !endif } @@ -3106,12 +3106,12 @@ index 739807efc4..f9b4ab4dfa 100644 NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 1eb46ac9a2..c81b422517 100644 +index d0cc107928..da68440ddb 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -296,7 +296,11 @@ INF ShellPkg/Application/Shell/Shell.inf - INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf +@@ -294,7 +294,11 @@ INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf !endif + INF ShellPkg/Application/Shell/Shell.inf +!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) +INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf diff --git a/0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch b/0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch index 33b54aa..91d0348 100644 --- a/0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch +++ b/0006-OvmfPkg-QemuVideoDxe-enable-debug-messages-in-VbeShi.patch @@ -1,4 +1,4 @@ -From e4021f592da913f7f2b841ce6d4272fb8410ac7f Mon Sep 17 00:00:00 2001 +From 17be7ae189a51fa09d2ccf9bedefb481c5ed22ea Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 12 Jun 2014 00:17:59 +0200 Subject: [PATCH] OvmfPkg: QemuVideoDxe: enable debug messages in VbeShim diff --git a/0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch b/0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch index a651a68..5a18c92 100644 --- a/0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch +++ b/0007-MdeModulePkg-TerminalDxe-add-other-text-resolutions.patch @@ -1,4 +1,4 @@ -From b6e4c1bf03878da7bd82224d523c44fd1fa96aaa Mon Sep 17 00:00:00 2001 +From 07ce34a8761d89ab3d6009576f995ff48bbd7487 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 18:40:35 +0100 Subject: [PATCH] MdeModulePkg: TerminalDxe: add other text resolutions diff --git a/0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index 51edfae..3c6cf4b 100644 --- a/0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0008-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,4 +1,4 @@ -From f337eb3972afcccabe86fe663202a758337d0ab8 Mon Sep 17 00:00:00 2001 +From 84e29eaec51ad2365674fbbaa6556c456b983367 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 22:40:01 +0100 Subject: [PATCH] MdeModulePkg: TerminalDxe: set xterm resolution on mode @@ -37,10 +37,10 @@ Signed-off-by: Paolo Bonzini 3 files changed, 36 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 6a6d9660ed..2dc1cf94e2 100644 +index a2130bc439..dcd118ba62 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -1936,6 +1936,10 @@ +@@ -1968,6 +1968,10 @@ # @Prompt The address mask when memory encryption is enabled. gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrMask|0x0|UINT64|0x30001047 @@ -107,7 +107,7 @@ index 4d7218e415..295e7641a5 100644 Status = This->ClearScreen (This); diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -index 0780296798..bd2ba828a6 100644 +index 15b4ac1c33..a704bc17e5 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf @@ -60,6 +60,7 @@ diff --git a/0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index 0672e56..2546753 100644 --- a/0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0009-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,4 +1,4 @@ -From 30251344cfbd25212394c377b80cd720a3b85d46 Mon Sep 17 00:00:00 2001 +From 040bd938a84163ba1f196de97f9137bcc84f653d Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 15:59:06 +0200 Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH @@ -29,10 +29,10 @@ Signed-off-by: Paolo Bonzini 5 files changed, 5 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 0a49336c0d..8dc3ad2be4 100644 +index 5dd44bceb7..702d3a86c4 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -535,6 +535,7 @@ +@@ -531,6 +531,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -41,10 +41,10 @@ index 0a49336c0d..8dc3ad2be4 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index a3d51ef0f7..d81cd865d5 100644 +index 9a14a26845..46bc3a0b77 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -541,6 +541,7 @@ +@@ -537,6 +537,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -53,10 +53,10 @@ index a3d51ef0f7..d81cd865d5 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index f9b4ab4dfa..85bd8d4bf6 100644 +index 0f888b0373..31c5933016 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -540,6 +540,7 @@ +@@ -536,6 +536,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -65,7 +65,7 @@ index f9b4ab4dfa..85bd8d4bf6 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0 diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index 5a78668126..544ac547bf 100644 +index 22139a64cb..64b8034117 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -670,6 +670,7 @@ InitializePlatform ( @@ -75,12 +75,12 @@ index 5a78668126..544ac547bf 100644 + UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm); } - AmdSevInitialize (); + InstallClearCacheCallback (); diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf -index 9c5ad9961c..31baaa0a22 100644 +index 5c8dd0fe6d..035ce249fe 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf -@@ -94,6 +94,7 @@ +@@ -96,6 +96,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration diff --git a/0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch b/0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch index a29a8bc..5fa8cc9 100644 --- a/0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch +++ b/0010-ArmVirtPkg-QemuFwCfgLib-allow-UEFI_DRIVER-client-mod.patch @@ -1,4 +1,4 @@ -From 92f37a3d72213d9b76bc47c4f194f2ea989a71a1 Mon Sep 17 00:00:00 2001 +From 1931e213b6185c87f95f8ce6aec005272dba2621 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 12 Apr 2016 20:50:25 +0200 Subject: [PATCH] ArmVirtPkg: QemuFwCfgLib: allow UEFI_DRIVER client modules diff --git a/0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index 6d7967e..e25543e 100644 --- a/0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0011-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,4 +1,4 @@ -From 6a27daa40698f06a34c209bd90092011d70f7795 Mon Sep 17 00:00:00 2001 +From 18b097d4857f31d0117e31872d989b39c30215a6 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:50 +0000 Subject: [PATCH] ArmVirtPkg: take PcdResizeXterm from the QEMU command line @@ -31,10 +31,10 @@ Signed-off-by: Paolo Bonzini create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index a7a3899560..86d5d5a666 100644 +index 319254f0db..9a2b861fae 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -206,6 +206,8 @@ +@@ -221,6 +221,8 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0 gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated|FALSE @@ -43,7 +43,7 @@ index a7a3899560..86d5d5a666 100644 [PcdsDynamicHii] gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS -@@ -282,7 +284,10 @@ +@@ -297,7 +299,10 @@ MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf diff --git a/0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch b/0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch index 0a4b6e3..a5c6f80 100644 --- a/0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch +++ b/0012-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch @@ -1,4 +1,4 @@ -From 84570add9731d2099c6e5be43f96aed508fd4c39 Mon Sep 17 00:00:00 2001 +From 026848dd55609cd184cd8fef3b312236e0ee3024 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 4 Nov 2014 23:02:53 +0100 Subject: [PATCH] OvmfPkg: allow exclusion of the shell from the firmware image @@ -50,64 +50,60 @@ Signed-off-by: Laszlo Ersek Signed-off-by: Paolo Bonzini --- OvmfPkg/OvmfPkgIa32.fdf | 2 ++ - OvmfPkg/OvmfPkgIa32X64.fdf | 2 ++ - OvmfPkg/OvmfPkgX64.fdf | 2 ++ - 3 files changed, 6 insertions(+) + OvmfPkg/OvmfPkgIa32X64.fdf | 3 +++ + OvmfPkg/OvmfPkgX64.fdf | 3 +++ + 3 files changed, 8 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 4177379a23..8c0b6ee1bd 100644 +index 77d0d3f131..aa07387d19 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -288,12 +288,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -288,10 +288,12 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +!ifndef $(EXCLUDE_SHELL_FROM_FD) - !ifndef $(USE_OLD_SHELL) + !if $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf - INF ShellPkg/Application/Shell/Shell.inf - !else - INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf !endif + INF ShellPkg/Application/Shell/Shell.inf +!endif !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 5e57161154..8de20366d2 100644 +index da68440ddb..585d97685a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -289,12 +289,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -289,10 +289,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +!ifndef $(EXCLUDE_SHELL_FROM_FD) - !ifndef $(USE_OLD_SHELL) + !if $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf - INF ShellPkg/Application/Shell/Shell.inf - !else - INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf !endif + INF ShellPkg/Application/Shell/Shell.inf +!endif ++ !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index c81b422517..49ef829a3a 100644 +index da68440ddb..585d97685a 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -289,12 +289,14 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -289,10 +289,13 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +!ifndef $(EXCLUDE_SHELL_FROM_FD) - !ifndef $(USE_OLD_SHELL) + !if $(TOOL_CHAIN_TAG) != "XCODE5" INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf - INF ShellPkg/Application/Shell/Shell.inf - !else - INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf !endif + INF ShellPkg/Application/Shell/Shell.inf +!endif ++ !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE) INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf diff --git a/0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch b/0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch index cb60132..168326b 100644 --- a/0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch +++ b/0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch @@ -1,4 +1,4 @@ -From 685d43b29b2ac4b19572bda1ebeb989d69d74ebb Mon Sep 17 00:00:00 2001 +From deeaddfb366703c157668588947e5f1767a1193a Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 4 Nov 2014 23:02:55 +0100 Subject: [PATCH] OvmfPkg: EnrollDefaultKeys: application for enrolling default @@ -1282,10 +1282,10 @@ index 0000000000..0ad86a2843 + UefiLib + UefiRuntimeServicesTableLib diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 8dc3ad2be4..518f6db2c6 100644 +index 702d3a86c4..877f0fc83c 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -876,6 +876,10 @@ +@@ -873,6 +873,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -1297,10 +1297,10 @@ index 8dc3ad2be4..518f6db2c6 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index d81cd865d5..ed2f876e7e 100644 +index 46bc3a0b77..6ff2121122 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -885,6 +885,10 @@ +@@ -882,6 +882,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf @@ -1312,10 +1312,10 @@ index d81cd865d5..ed2f876e7e 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 85bd8d4bf6..a12905f882 100644 +index 31c5933016..12676f5ba6 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -883,6 +883,10 @@ +@@ -880,6 +880,10 @@ !if $(SECURE_BOOT_ENABLE) == TRUE SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf diff --git a/0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch b/0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch index 3c9f001..1e66bb3 100644 --- a/0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch +++ b/0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch @@ -1,4 +1,4 @@ -From 6f89eae9f2abe20e35058848e7cc10a69a6b05ec Mon Sep 17 00:00:00 2001 +From ddb3084986db65a9006d28d5e9b6f0f7969cf2c0 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:49:43 +0200 Subject: [PATCH] ArmPlatformPkg: introduce fixed PCD for early hello message @@ -36,10 +36,10 @@ Signed-off-by: Paolo Bonzini 1 file changed, 7 insertions(+) diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec -index 5f67e74154..2956d3e2d8 100644 +index 44c00bd0c1..40c8ec3251 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dec +++ b/ArmPlatformPkg/ArmPlatformPkg.dec -@@ -113,6 +113,13 @@ +@@ -114,6 +114,13 @@ ## If set, this will swap settings for HDLCD RED_SELECT and BLUE_SELECT registers gArmPlatformTokenSpaceGuid.PcdArmHdLcdSwapBlueRedSelect|FALSE|BOOLEAN|0x00000045 diff --git a/0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch b/0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch index 32ce0b3..23a2de2 100644 --- a/0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch +++ b/0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch @@ -1,4 +1,4 @@ -From e6c0f362edd5834b0d891fc44cd6873566bb0df4 Mon Sep 17 00:00:00 2001 +From b317a290531118f54808ebe015ee1957262fdced Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:59:20 +0200 Subject: [PATCH] ArmPlatformPkg: PrePeiCore: write early hello message to the diff --git a/0016-ArmVirtPkg-set-early-hello-message-RH-only.patch b/0016-ArmVirtPkg-set-early-hello-message-RH-only.patch index 35303e7..d667a2f 100644 --- a/0016-ArmVirtPkg-set-early-hello-message-RH-only.patch +++ b/0016-ArmVirtPkg-set-early-hello-message-RH-only.patch @@ -1,4 +1,4 @@ -From e777f7d03c8a8d56e08926ecf0b17e1338837093 Mon Sep 17 00:00:00 2001 +From 48efc8ca8b083936939d679e8b489dea97bcf695 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 14:07:17 +0200 Subject: [PATCH] ArmVirtPkg: set early hello message (RH only) @@ -27,14 +27,14 @@ Signed-off-by: Paolo Bonzini 1 file changed, 1 insertion(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 86d5d5a666..ffe4ba8092 100644 +index 9a2b861fae..dd644b181e 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -87,6 +87,7 @@ - gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE +@@ -94,6 +94,7 @@ + gEfiMdeModulePkgTokenSpaceGuid.PcdTurnOffUsbLegacySupport|TRUE [PcdsFixedAtBuild.common] + gArmPlatformTokenSpaceGuid.PcdEarlyHelloMessage|"UEFI firmware starting.\r\n" - gArmPlatformTokenSpaceGuid.PcdCoreCount|1 !if $(ARCH) == AARCH64 gArmTokenSpaceGuid.PcdVFPEnabled|1 + !endif diff --git a/0017-BaseTools-footer.makefile-expand-BUILD_CFLAGS-last-f.patch b/0017-BaseTools-footer.makefile-expand-BUILD_CFLAGS-last-f.patch deleted file mode 100644 index a1e5144..0000000 --- a/0017-BaseTools-footer.makefile-expand-BUILD_CFLAGS-last-f.patch +++ /dev/null @@ -1,35 +0,0 @@ -From eebbf279b59afa3787d11734d9707cc7ab24d651 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Wed, 25 Jul 2018 22:27:53 +0200 -Subject: [PATCH] BaseTools/footer.makefile: expand BUILD_CFLAGS last for C - files too - -BUILD_CPPFLAGS should be expanded before BUILD_CFLAGS. (The rule for C++ -source files already does this, with BUILD_CPPFLAGS and BUILD_CXXFLAGS.) - -This patch doesn't change behavior. - -Cc: Liming Gao -Cc: Yonghong Zhu -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Liming Gao -(cherry picked from commit 67983484a4430c5f82bb5f1397e010c759136321) ---- - BaseTools/Source/C/Makefiles/footer.makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/BaseTools/Source/C/Makefiles/footer.makefile b/BaseTools/Source/C/Makefiles/footer.makefile -index 0926aa9645..5bda9e4e36 100644 ---- a/BaseTools/Source/C/Makefiles/footer.makefile -+++ b/BaseTools/Source/C/Makefiles/footer.makefile -@@ -24,7 +24,7 @@ $(LIBRARY): $(OBJECTS) - $(BUILD_AR) crs $@ $^ - - %.o : %.c -- $(BUILD_CC) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ -+ $(BUILD_CC) -c $(BUILD_CPPFLAGS) $(BUILD_CFLAGS) $< -o $@ - - %.o : %.cpp - $(BUILD_CXX) -c $(BUILD_CPPFLAGS) $(BUILD_CXXFLAGS) $< -o $@ diff --git a/0018-BaseTools-header.makefile-remove-c-from-BUILD_CFLAGS.patch b/0018-BaseTools-header.makefile-remove-c-from-BUILD_CFLAGS.patch deleted file mode 100644 index 0942d9e..0000000 --- a/0018-BaseTools-header.makefile-remove-c-from-BUILD_CFLAGS.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 0af592dfa9a6d1a3379db1331344f411f7774bea Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Wed, 25 Jul 2018 22:40:09 +0200 -Subject: [PATCH] BaseTools/header.makefile: remove "-c" from BUILD_CFLAGS - -Option "-c" is a mode selection flag (choosing between compiling and -linking); it should not be in BUILD_CFLAGS, which applies only to -compiling anyway. The compilation rule for C source files, in -"footer.makefile", already includes "-c" -- currently we have double "-c" -options. - -This patch doesn't change behavior. - -Cc: Liming Gao -Cc: Yonghong Zhu -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Liming Gao -(cherry picked from commit 03252ae287c4a61983b3793ff71baeabe2ff3df7) ---- - BaseTools/Source/C/Makefiles/header.makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index db436773cf..08421ba24c 100644 ---- a/BaseTools/Source/C/Makefiles/header.makefile -+++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -71,9 +71,9 @@ INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKE - BUILD_CPPFLAGS = $(INCLUDE) -O2 - ifeq ($(DARWIN),Darwin) - # assume clang or clang compatible flags on OS X --BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g -+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g - else --BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -c -g -+BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-restrict -Wno-unused-result -nostdlib -g - endif - BUILD_LFLAGS = - BUILD_CXXFLAGS = -Wno-unused-result diff --git a/0019-BaseTools-Source-C-split-O2-to-BUILD_OPTFLAGS.patch b/0019-BaseTools-Source-C-split-O2-to-BUILD_OPTFLAGS.patch deleted file mode 100644 index 52528d9..0000000 --- a/0019-BaseTools-Source-C-split-O2-to-BUILD_OPTFLAGS.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 67c8bbaf89bbb4015f0b915fed6fb2f35efd282f Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Wed, 25 Jul 2018 22:59:57 +0200 -Subject: [PATCH] BaseTools/Source/C: split "-O2" to BUILD_OPTFLAGS - -The option "-O2" is not a preprocessor flag, but a code generation -(compilation) flag. Move it from BUILD_CPPFLAGS to BUILD_CFLAGS and -BUILD_CXXFLAGS. - -Because "VfrCompile/GNUmakefile" uses "-O2" through BUILD_CPPFLAGS, and -because it doesn't use BUILD_CXXFLAGS, we have to introduce BUILD_OPTFLAGS -separately, so that "VfrCompile/GNUmakefile" can continue using just this -flag. - -This patch doesn't change behavior. - -Cc: Liming Gao -Cc: Yonghong Zhu -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Liming Gao -(cherry picked from commit b8a66170264395edeaa61e6d22930a58e576a685) ---- - BaseTools/Source/C/Makefiles/header.makefile | 6 +++++- - BaseTools/Source/C/VfrCompile/GNUmakefile | 11 +++++++---- - 2 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 08421ba24c..498c6cf48b 100644 ---- a/BaseTools/Source/C/Makefiles/header.makefile -+++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -68,7 +68,8 @@ $(error Bad HOST_ARCH) - endif - - INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) --BUILD_CPPFLAGS = $(INCLUDE) -O2 -+BUILD_CPPFLAGS = $(INCLUDE) -+BUILD_OPTFLAGS = -O2 - ifeq ($(DARWIN),Darwin) - # assume clang or clang compatible flags on OS X - BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g -@@ -91,6 +92,9 @@ ifeq ($(DARWIN),Darwin) - endif - endif - -+# keep BUILD_OPTFLAGS last -+BUILD_CFLAGS += $(BUILD_OPTFLAGS) -+BUILD_CXXFLAGS += $(BUILD_OPTFLAGS) - - .PHONY: all - .PHONY: install -diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile -index c4ec61aa6c..bbe562cbc5 100644 ---- a/BaseTools/Source/C/VfrCompile/GNUmakefile -+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile -@@ -25,6 +25,9 @@ OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o EfiVfrParser.o VfrLexer.o VfrSyn - - VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS) - -+# keep BUILD_OPTFLAGS last -+VFR_CXXFLAGS = $(BUILD_OPTFLAGS) -+ - LINKER = $(BUILD_CXX) - - EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h -@@ -58,16 +61,16 @@ Pccts/dlg/dlg: - BIN_DIR='.' $(MAKE) -C Pccts/dlg - - ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp -- $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@ -+ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@ - - DLexerBase.o: Pccts/h/DLexerBase.cpp -- $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@ -+ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@ - - AParser.o: Pccts/h/AParser.cpp -- $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@ -+ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@ - - VfrSyntax.o: VfrSyntax.cpp -- $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@ -+ $(BUILD_CXX) -c $(VFR_CPPFLAGS) $(INC) $(VFR_CXXFLAGS) $? -o $@ - - clean: localClean - diff --git a/0020-BaseTools-Source-C-take-EXTRA_OPTFLAGS-from-the-call.patch b/0020-BaseTools-Source-C-take-EXTRA_OPTFLAGS-from-the-call.patch deleted file mode 100644 index f61aebe..0000000 --- a/0020-BaseTools-Source-C-take-EXTRA_OPTFLAGS-from-the-call.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 26296351f9a6b6dad0604f8ed62ce5de0f41ac2c Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 26 Jul 2018 00:04:26 +0200 -Subject: [PATCH] BaseTools/Source/C: take EXTRA_OPTFLAGS from the caller - -Allow the caller of the top-level makefile either to set EXTRA_OPTFLAGS in -the environment or to pass EXTRA_OPTFLAGS as a macro definition on the -command line. EXTRA_OPTFLAGS extends (and potentially overrides) default C -compilation flags set in the makefiles. - -Cc: Liming Gao -Cc: Yonghong Zhu -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Liming Gao -(cherry picked from commit b0ca5dae78ff71397a8ef568f1914da7668ff5a9) ---- - BaseTools/Source/C/Makefiles/header.makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 498c6cf48b..1b4cad5497 100644 ---- a/BaseTools/Source/C/Makefiles/header.makefile -+++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -69,7 +69,10 @@ endif - - INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) - BUILD_CPPFLAGS = $(INCLUDE) --BUILD_OPTFLAGS = -O2 -+ -+# keep EXTRA_OPTFLAGS last -+BUILD_OPTFLAGS = -O2 $(EXTRA_OPTFLAGS) -+ - ifeq ($(DARWIN),Darwin) - # assume clang or clang compatible flags on OS X - BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -g diff --git a/0021-BaseTools-Source-C-take-EXTRA_LDFLAGS-from-the-calle.patch b/0021-BaseTools-Source-C-take-EXTRA_LDFLAGS-from-the-calle.patch deleted file mode 100644 index ed987d0..0000000 --- a/0021-BaseTools-Source-C-take-EXTRA_LDFLAGS-from-the-calle.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c1a087a76d91665433f190d0468be2b33da443cd Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 26 Jul 2018 01:24:40 +0200 -Subject: [PATCH] BaseTools/Source/C: take EXTRA_LDFLAGS from the caller - -Allow the caller of the top-level makefile either to set EXTRA_LDFLAGS in -the environment or to pass EXTRA_LDFLAGS as a macro definition on the -command line. EXTRA_LDFLAGS extends (and potentially overrides) default -link-editing flags set in the makefiles. - -Cc: Liming Gao -Cc: Yonghong Zhu -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244 -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Liming Gao -(cherry picked from commit 81502cee20ac4046f08bb4aec754c7091c8808dc) ---- - BaseTools/Source/C/Makefiles/header.makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 1b4cad5497..7f283d6464 100644 ---- a/BaseTools/Source/C/Makefiles/header.makefile -+++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -99,6 +99,9 @@ endif - BUILD_CFLAGS += $(BUILD_OPTFLAGS) - BUILD_CXXFLAGS += $(BUILD_OPTFLAGS) - -+# keep EXTRA_LDFLAGS last -+BUILD_LFLAGS += $(EXTRA_LDFLAGS) -+ - .PHONY: all - .PHONY: install - .PHONY: clean diff --git a/0022-BaseTools-VfrCompile-honor-EXTRA_LDFLAGS.patch b/0022-BaseTools-VfrCompile-honor-EXTRA_LDFLAGS.patch deleted file mode 100644 index a3e89c5..0000000 --- a/0022-BaseTools-VfrCompile-honor-EXTRA_LDFLAGS.patch +++ /dev/null @@ -1,69 +0,0 @@ -From d30cba687d657a68bf83b8dd54db63b3e2e6cb54 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 16 Aug 2018 19:38:02 -0700 -Subject: [PATCH] BaseTools/VfrCompile: honor EXTRA_LDFLAGS - -In commit 81502cee20ac ("BaseTools/Source/C: take EXTRA_LDFLAGS from the -caller", 2018-08-16), I missed that "VfrCompile/GNUmakefile" does not use -BUILD_LFLAGS in the APPLICATION linking rule, unlike "app.makefile" does. -Instead, "VfrCompile/GNUmakefile" uses the (undefined) LFLAGS macro. -Therefore commit 81502cee20ac did not cover the linking step of -VfrCompile. - -Thankfully, the structure of the linking rules is the same, between -"app.makefile" and "VfrCompile/GNUmakefile". Rename the undefined LFLAGS -macro in "VfrCompile/GNUmakefile" to VFR_LFLAGS (for consistency with -VFR_CXXFLAGS), and set it to EXTRA_LDFLAGS. - -As a result, we have: - - | compilation | linking - -----------+--------------------------------+---------------------- - VfrCompile | VFR_CXXFLAGS = | VFR_LFLAGS = - | BUILD_OPTFLAGS = | EXTRA_LDFLAGS - | '-O2' + EXTRA_OPTFLAGS | - -----------+--------------------------------+---------------------- - other apps | BUILD_CFLAGS/BUILD_CXXFLAGS = | BUILD_LFLAGS = - | [...] + BUILD_OPTFLAGS = | [...] + EXTRA_LDFLAGS - | [...] + '-O2' + EXTRA_OPTFLAGS | - -This table shows -- that the VfrCompile compilation and linking flags are always a subset of - the corresponding flags used by the other apps, -- and that the EXTRA flags are always at the end. - -Cc: Liming Gao -Cc: Yonghong Zhu -Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1540244 -Fixes: 81502cee20ac4046f08bb4aec754c7091c8808dc -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Laszlo Ersek -Reviewed-by: Liming Gao -(cherry picked from commit aa4e0df1f0c7ffdff07d7e382c9da89cbe207cdb) ---- - BaseTools/Source/C/VfrCompile/GNUmakefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile b/BaseTools/Source/C/VfrCompile/GNUmakefile -index bbe562cbc5..9273589ff8 100644 ---- a/BaseTools/Source/C/VfrCompile/GNUmakefile -+++ b/BaseTools/Source/C/VfrCompile/GNUmakefile -@@ -28,6 +28,9 @@ VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(BUILD_CPPFLAGS) - # keep BUILD_OPTFLAGS last - VFR_CXXFLAGS = $(BUILD_OPTFLAGS) - -+# keep EXTRA_LDFLAGS last -+VFR_LFLAGS = $(EXTRA_LDFLAGS) -+ - LINKER = $(BUILD_CXX) - - EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h -@@ -42,7 +45,7 @@ APPLICATION = $(MAKEROOT)/bin/$(APPNAME) - all: $(MAKEROOT)/bin $(APPLICATION) - - $(APPLICATION): $(OBJECTS) -- $(LINKER) -o $(APPLICATION) $(LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS) -+ $(LINKER) -o $(APPLICATION) $(VFR_LFLAGS) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS) - - VfrCompiler.o: ../Include/Common/BuildVersion.h - diff --git a/0023-NetworkPkg-UefiPxeBcDxe-Add-EXCLUSIVE-attribute-when.patch b/0023-NetworkPkg-UefiPxeBcDxe-Add-EXCLUSIVE-attribute-when.patch deleted file mode 100644 index 6487983..0000000 --- a/0023-NetworkPkg-UefiPxeBcDxe-Add-EXCLUSIVE-attribute-when.patch +++ /dev/null @@ -1,73 +0,0 @@ -From cde5a72d365eff5b02b8330fef1c8d36fced08eb Mon Sep 17 00:00:00 2001 -From: "edk2-devel-bounces@lists.01.org" -Date: Fri, 14 Sep 2018 16:24:15 +0800 -Subject: [PATCH] NetworkPkg: UefiPxeBcDxe: Add EXCLUSIVE attribute when - opening SNP protocol installed by PXE. - -Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=1152 - -v2: Sync the same logic to Ipv6 and update code comments. - -The PXE driver installs a SNP and open this SNP with attribute BY_DRIVER -to avoid it being opened by MNP driver, this SNP is also expected not to -be opened by other drivers with EXCLUSIVE attribute. In some cases, other -drivers may happen to do this by error, and thus cause a system crash. -This patch adds EXCLUSIVE attribute when opening SNP in PXE driver, and -will reject all OpenProtocol requests by EXCLUSIVE. - -Cc: Subramanian, Sriram -Cc: Ye Ting -Cc: Fu Siyuan -Cc: Wu Jiaxin -Contributed-under: TianoCore Contribution Agreement 1.1 -Signed-off-by: Wang Fan -Reviewed-by: Sriram Subramanian -Reviewed-by: Fu Siyuan -Reviewed-by: Wu Jiaxin ---- - NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c -index bc9dc914f3..0ab640beca 100644 ---- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c -+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c -@@ -814,7 +814,7 @@ PxeBcCreateIp4Children ( - } - - // -- // Open SNP on the child handle BY_DRIVER. It will prevent any additionally -+ // Open SNP on the child handle BY_DRIVER|EXCLUSIVE. It will prevent any additionally - // layering to perform the experiment. - // - Status = gBS->OpenProtocol ( -@@ -823,7 +823,7 @@ PxeBcCreateIp4Children ( - (VOID **) &Snp, - This->DriverBindingHandle, - Private->Ip4Nic->Controller, -- EFI_OPEN_PROTOCOL_BY_DRIVER -+ EFI_OPEN_PROTOCOL_BY_DRIVER|EFI_OPEN_PROTOCOL_EXCLUSIVE - ); - if (EFI_ERROR (Status)) { - goto ON_ERROR; -@@ -1157,7 +1157,7 @@ PxeBcCreateIp6Children ( - } - - // -- // Open SNP on the child handle BY_DRIVER. It will prevent any additionally -+ // Open SNP on the child handle BY_DRIVER|EXCLUSIVE. It will prevent any additionally - // layering to perform the experiment. - // - Status = gBS->OpenProtocol ( -@@ -1166,7 +1166,7 @@ PxeBcCreateIp6Children ( - (VOID **) &Snp, - This->DriverBindingHandle, - Private->Ip6Nic->Controller, -- EFI_OPEN_PROTOCOL_BY_DRIVER -+ EFI_OPEN_PROTOCOL_BY_DRIVER|EFI_OPEN_PROTOCOL_EXCLUSIVE - ); - if (EFI_ERROR (Status)) { - goto ON_ERROR; --- -2.17.1 - diff --git a/0099-Tweak-the-tools_def-to-support-cross-compiling.patch b/0099-Tweak-the-tools_def-to-support-cross-compiling.patch index bada25f..ef2f30a 100644 --- a/0099-Tweak-the-tools_def-to-support-cross-compiling.patch +++ b/0099-Tweak-the-tools_def-to-support-cross-compiling.patch @@ -1,4 +1,4 @@ -From 0784bdc810bcbd275a78ceb0c2cf04f2f0f68061 Mon Sep 17 00:00:00 2001 +From 70e4530eefdb2cecc37fff91235e716ed76f2da2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 16 Aug 2018 15:45:47 -0400 Subject: [PATCH] Tweak the tools_def to support cross-compiling. @@ -12,10 +12,10 @@ Signed-off-by: Cole Robinson 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index a22b96c0b8..8b134ca93f 100755 +index 7bf682ffa9..ad1bbcbdc6 100755 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template -@@ -5068,17 +5068,17 @@ RELEASE_GCC49_AARCH64_DLINK_FLAGS = DEF(GCC49_AARCH64_DLINK_FLAGS) +@@ -3517,17 +3517,17 @@ RELEASE_GCC49_AARCH64_DLINK_XIPFLAGS = -z common-page-size=0x20 ################## # GCC5 IA32 definitions ################## @@ -42,9 +42,9 @@ index a22b96c0b8..8b134ca93f 100755 +*_GCC5_IA32_ASLPP_PATH = ENV(GCC5_IA32_PREFIX)gcc +*_GCC5_IA32_RC_PATH = ENV(GCC5_IA32_PREFIX)objcopy - *_GCC5_IA32_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m32 -fno-lto + *_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 -@@ -5100,17 +5100,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, +@@ -3549,17 +3549,17 @@ RELEASE_GCC5_IA32_DLINK_FLAGS = DEF(GCC5_IA32_X64_DLINK_FLAGS) -flto -Os -Wl, ################## # GCC5 X64 definitions ################## @@ -71,5 +71,5 @@ index a22b96c0b8..8b134ca93f 100755 +*_GCC5_X64_ASLPP_PATH = ENV(GCC5_X64_PREFIX)gcc +*_GCC5_X64_RC_PATH = ENV(GCC5_X64_PREFIX)objcopy - *_GCC5_X64_ASLCC_FLAGS = DEF(GCC_ASLCC_FLAGS) -m64 -fno-lto + *_GCC5_X64_ASLCC_FLAGS = DEF(GCC5_ASLCC_FLAGS) -m64 *_GCC5_X64_ASLDLINK_FLAGS = DEF(GCC5_IA32_X64_ASLDLINK_FLAGS) -Wl,-m,elf_x86_64 diff --git a/edk2.spec b/edk2.spec index 9896bd0..54ecc73 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,8 +1,19 @@ +# This package depends on automagic byte compilation +# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 +%global _python_bytecompile_extra 1 + +# RPM doesn't detect that code in /usr/share is python3, this forces it +# https://fedoraproject.org/wiki/Changes/Avoid_usr_bin_python_in_RPM_Build#Python_bytecompilation +%global __python %{__python3} + %global edk2_date 20180815 %global edk2_githash cb5f4f45ce -%global openssl_version 1.1.0h +%global openssl_version 1.1.0j %global qosb_version 1.1.3 +%global edk2_stable_date 201903 +%global edk2_stable_str edk2-stable%{edk2_stable_date} + %define qosb_testing 0 %ifarch x86_64 @@ -34,15 +45,17 @@ %endif Name: edk2 -Version: %{edk2_date}git%{edk2_githash} -Release: 6%{dist} +#Version: {edk2_date}git{edk2_githash} +Version: %{edk2_stable_date}stable +Release: 1%{dist} Summary: EFI Development Kit II License: BSD URL: http://www.tianocore.org/edk2/ # Tarball generated from git object update-tarball.sh script -Source0: edk2-%{edk2_date}-%{edk2_githash}.tar.xz +#Source0: edk2-{edk2_date}-{edk2_githash}.tar.xz +Source0: https://github.com/tianocore/edk2/archive/%{edk2_stable_str}.tar.gz#/edk2-%{edk2_stable_str}.tar.gz Source1: openssl-%{openssl_version}-hobbled.tar.xz Source2: ovmf-whitepaper-c770f8c.txt Source3: https://github.com/puiterwijk/qemu-ovmf-secureboot/archive/v%{qosb_version}/qemu-ovmf-secureboot-%{qosb_version}.tar.gz @@ -68,15 +81,6 @@ Patch0013: 0013-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch Patch0014: 0014-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch Patch0015: 0015-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch Patch0016: 0016-ArmVirtPkg-set-early-hello-message-RH-only.patch -# Fix passing through RPM build flags (bz 1540244) -Patch0017: 0017-BaseTools-footer.makefile-expand-BUILD_CFLAGS-last-f.patch -Patch0018: 0018-BaseTools-header.makefile-remove-c-from-BUILD_CFLAGS.patch -Patch0019: 0019-BaseTools-Source-C-split-O2-to-BUILD_OPTFLAGS.patch -Patch0020: 0020-BaseTools-Source-C-take-EXTRA_OPTFLAGS-from-the-call.patch -Patch0021: 0021-BaseTools-Source-C-take-EXTRA_LDFLAGS-from-the-calle.patch -Patch0022: 0022-BaseTools-VfrCompile-honor-EXTRA_LDFLAGS.patch -# Fix UEFI netboot -Patch0023: 0023-NetworkPkg-UefiPxeBcDxe-Add-EXCLUSIVE-attribute-when.patch %if 0%{?cross:1} # Tweak the tools_def to support cross-compiling. @@ -84,12 +88,6 @@ Patch0023: 0023-NetworkPkg-UefiPxeBcDxe-Add-EXCLUSIVE-attribute-when.patch Patch0099: 0099-Tweak-the-tools_def-to-support-cross-compiling.patch %endif -# openssl patches from Fedora -Patch1021: openssl-1.1.0-issuer-hash.patch -Patch1039: openssl-1.1.0-cc-reqs.patch -Patch1040: openssl-1.1.0-disable-ssl3.patch -Patch1044: openssl-1.1.0-bio-fd-preserve-nl.patch - %if 0%{?fedora:1} # # actual firmware builds support cross-compiling. edk2-tools @@ -103,7 +101,7 @@ ExclusiveArch: x86_64 aarch64 %endif BuildRequires: gcc gcc-c++ -BuildRequires: python2 python2-devel python +BuildRequires: python3 python3-devel BuildRequires: libuuid-devel %if 0%{?cross:1} BuildRequires: gcc-aarch64-linux-gnu @@ -114,6 +112,7 @@ BuildRequires: iasl BuildRequires: nasm BuildRequires: qemu-img BuildRequires: genisoimage +BuildRequires: bc # These are for QOSB BuildRequires: python3-requests @@ -141,7 +140,7 @@ build EFI executables and ROMs using the GNU tools. %package tools-python Summary: EFI Development Kit II Tools -Requires: python +Requires: python3 BuildArch: noarch %description tools-python @@ -218,7 +217,7 @@ armv7 UEFI Firmware %prep -%setup -q -n tianocore-%{name}-%{edk2_githash} +%setup -q -n edk2-%{edk2_stable_str} # Ensure old shell and binary packages are not used @@ -230,7 +229,7 @@ rm -rf ShellBinPkg # copy whitepaper into place cp -a -- %{SOURCE2} . # extract openssl into place -tar -xvf %{SOURCE1} --strip-components=1 +tar -xvf %{SOURCE1} --strip-components=1 --directory CryptoPkg/Library/OpensslLib/openssl # Extract QOSB tar -xvf %{SOURCE3} @@ -389,13 +388,10 @@ install BaseTools/Scripts/GccBase.lds \ %{buildroot}%{_datadir}/%{name}/Scripts cp -R BaseTools/Source/Python %{buildroot}%{_datadir}/%{name}/Python -%if 0%{?fedora} >= 29 -%py_byte_compile %{__python2} %{buildroot}%{_datadir}/%{name}/Python -%endif for i in build BPDG Ecc GenDepex GenFds GenPatchPcdTable PatchPcdValue TargetTool Trim UPT; do echo '#!/bin/sh export PYTHONPATH=%{_datadir}/%{name}/Python -exec python '%{_datadir}/%{name}/Python/$i/$i.py' "$@"' > %{buildroot}%{_bindir}/$i +exec python3 '%{_datadir}/%{name}/Python/$i/$i.py' "$@"' > %{buildroot}%{_bindir}/$i chmod +x %{buildroot}%{_bindir}/$i done @@ -431,19 +427,14 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_ %files tools %license License.txt %license LICENSE.openssl -%{_bindir}/BootSectImage %{_bindir}/Brotli %{_bindir}/DevicePath -%{_bindir}/EfiLdrImage %{_bindir}/EfiRom %{_bindir}/GenCrc32 %{_bindir}/GenFfs %{_bindir}/GenFv %{_bindir}/GenFw -%{_bindir}/GenPage %{_bindir}/GenSec -%{_bindir}/GenVtf -%{_bindir}/GnuGenBootSector %{_bindir}/LzmaCompress %{_bindir}/LzmaF86Compress %{_bindir}/Split @@ -528,6 +519,11 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_ %changelog +* Fri Mar 15 2019 Cole Robinson - 201903stable-1 +- Update to stable-201903 +- Update to openssl-1.1.0j +- Move to python3 deps + * Thu Jan 31 2019 Fedora Release Engineering - 20180815gitcb5f4f45ce-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/hobble-openssl b/hobble-openssl index 8750ad6..9a23ca6 100755 --- a/hobble-openssl +++ b/hobble-openssl @@ -8,40 +8,33 @@ set -e # IDEA: 5,214,703 07/01/2012 - expired, we do not remove it anymore # RC5: 5,724,428 01/11/2015 - expired, we do not remove it anymore # EC: ????????? ??/??/2020 -# SRP: ????????? ??/??/20?? +# SRP: ????????? ??/??/2017 - expired, we do not remove it anymore # Remove assembler portions of IDEA, MDC2, and RC5. # (find crypto/rc5/asm -type f | xargs -r rm -fv) -# SRP. -for a in srp; do - for c in `find crypto/$a -name "*.c" -a \! -name "*test*" -type f` ; do +for c in `find crypto/bn -name "*gf2m.c"`; do echo Destroying $c > $c - done done -for c in `find crypto/bn -name "*gf2m.c"`; do +for c in `find crypto/ec -name "ec2*.c" -o -name "ec_curve.c"`; do echo Destroying $c > $c done -for c in `find crypto/ec -name "ec2*.c" -o -name "ec_curve.c" -o -name "ecp_nistp22?.c" -o -name "ectest.c"`; do +for c in `find test -name "ectest.c"`; do echo Destroying $c > $c done for h in `find crypto ssl apps test -name "*.h"` ; do - echo Removing SRP and EC2M references from $h + echo Removing EC2M references from $h cat $h | \ awk 'BEGIN {ech=1;} \ - /^#[ \t]*ifndef.*NO_SRP/ {ech--; next;} \ /^#[ \t]*ifndef.*NO_EC2M/ {ech--; next;} \ /^#[ \t]*if/ {if(ech < 1) ech--;} \ {if(ech>0) {;print $0};} \ /^#[ \t]*endif/ {if(ech < 1) ech++;}' > $h.hobbled && \ mv $h.hobbled $h done - -# Make the makefiles happy. -# touch crypto/rc5/asm/rc5-586.pl diff --git a/openssl-1.1.0-bio-fd-preserve-nl.patch b/openssl-1.1.0-bio-fd-preserve-nl.patch deleted file mode 100644 index 5d71291..0000000 --- a/openssl-1.1.0-bio-fd-preserve-nl.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c b/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c -index 2bd3517..a886655 100644 ---- a/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c -+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/bio/bss_fd.c -@@ -204,8 +204,10 @@ static int fd_gets(BIO *bp, char *buf, int size) - char *ptr = buf; - char *end = buf + size - 1; - -- while ((ptr < end) && (fd_read(bp, ptr, 1) > 0) && (ptr[0] != '\n')) -- ptr++; -+ while (ptr < end && fd_read(bp, ptr, 1) > 0) { -+ if (*ptr++ == '\n') -+ break; -+ } - - ptr[0] = '\0'; - -diff --git a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod b/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod -index 45871c1..fe70e9f 100644 ---- a/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod -+++ b/CryptoPkg/Library/OpensslLib/openssl/doc/crypto/BIO_read.pod -@@ -23,7 +23,8 @@ in B. Usually this operation will attempt to read a line of data - from the BIO of maximum length B. There are exceptions to this, - however; for example, BIO_gets() on a digest BIO will calculate and - return the digest and other BIOs may not support BIO_gets() at all. --The returned string is always NUL-terminated. -+The returned string is always NUL-terminated and the '\n' is preserved -+if present in the input data. - - BIO_write() attempts to write B bytes from B to BIO B. - --- -2.17.0 - diff --git a/openssl-1.1.0-cc-reqs.patch b/openssl-1.1.0-cc-reqs.patch deleted file mode 100644 index b62e75f..0000000 --- a/openssl-1.1.0-cc-reqs.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c -+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/rsa/rsa_gen.c -@@ -86,6 +86,12 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, - if (!rsa->iqmp && ((rsa->iqmp = BN_secure_new()) == NULL)) - goto err; - -+ /* prepare minimum p and q difference */ -+ if (!BN_one(r3)) -+ goto err; -+ if (bitsp > 100 && !BN_lshift(r3, r3, bitsp - 100)) -+ goto err; -+ - if (BN_copy(rsa->e, e_value) == NULL) - goto err; - -@@ -118,7 +124,9 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, - do { - if (!BN_generate_prime_ex(rsa->q, bitsq, 0, NULL, NULL, cb)) - goto err; -- } while (BN_cmp(rsa->p, rsa->q) == 0); -+ if (!BN_sub(r2, rsa->q, rsa->p)) -+ goto err; -+ } while (BN_ucmp(r2, r3) <= 0); - if (!BN_sub(r2, rsa->q, BN_value_one())) - goto err; - ERR_set_mark(); --- -2.17.0 - diff --git a/openssl-1.1.0-disable-ssl3.patch b/openssl-1.1.0-disable-ssl3.patch deleted file mode 100644 index 1e61659..0000000 --- a/openssl-1.1.0-disable-ssl3.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c -index 8a190d2..6b4c5ae 100644 ---- a/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c -+++ b/CryptoPkg/Library/OpensslLib/openssl/ssl/ssl_lib.c -@@ -2653,6 +2653,13 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth) - * or by using the SSL_CONF library. - */ - ret->options |= SSL_OP_NO_COMPRESSION; -+ /* -+ * Disable SSLv3 by default. Applications can -+ * re-enable it by configuring -+ * SSL_CTX_clear_options(ctx, SSL_OP_NO_SSLv3); -+ * or by using the SSL_CONF library. -+ */ -+ ret->options |= SSL_OP_NO_SSLv3; - - ret->tlsext_status_type = -1; - -diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c -index 2cbbddd..1a409d1 100644 ---- a/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c -+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssl_test.c -@@ -277,6 +277,7 @@ static int execute_test(SSL_TEST_FIXTURE fixture) - SSL_TEST_SERVERNAME_CB_NONE) { - server2_ctx = SSL_CTX_new(TLS_server_method()); - TEST_check(server2_ctx != NULL); -+ SSL_CTX_clear_options(server2_ctx, SSL_OP_NO_SSLv3); - } - client_ctx = SSL_CTX_new(TLS_client_method()); - TEST_check(SSL_CTX_set_max_proto_version(client_ctx, TLS_MAX_VERSION)); -@@ -290,11 +291,15 @@ static int execute_test(SSL_TEST_FIXTURE fixture) - TLS_MAX_VERSION)); - TEST_check(resume_server_ctx != NULL); - TEST_check(resume_client_ctx != NULL); -+ SSL_CTX_clear_options(resume_server_ctx, SSL_OP_NO_SSLv3); -+ SSL_CTX_clear_options(resume_client_ctx, SSL_OP_NO_SSLv3); - } - } - - TEST_check(server_ctx != NULL); - TEST_check(client_ctx != NULL); -+ SSL_CTX_clear_options(server_ctx, SSL_OP_NO_SSLv3); -+ SSL_CTX_clear_options(client_ctx, SSL_OP_NO_SSLv3); - - TEST_check(CONF_modules_load(conf, fixture.test_app, 0) > 0); - -diff --git a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c -index e77c692..e586072 100644 ---- a/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c -+++ b/CryptoPkg/Library/OpensslLib/openssl/test/ssltest_old.c -@@ -1460,6 +1460,11 @@ int main(int argc, char *argv[]) - ERR_print_errors(bio_err); - goto end; - } -+ -+ SSL_CTX_clear_options(c_ctx, SSL_OP_NO_SSLv3); -+ SSL_CTX_clear_options(s_ctx, SSL_OP_NO_SSLv3); -+ SSL_CTX_clear_options(s_ctx2, SSL_OP_NO_SSLv3); -+ - /* - * Since we will use low security ciphersuites and keys for testing set - * security level to zero by default. Tests can override this by adding --- -2.17.0 - diff --git a/openssl-1.1.0-issuer-hash.patch b/openssl-1.1.0-issuer-hash.patch deleted file mode 100644 index 74087f3..0000000 --- a/openssl-1.1.0-issuer-hash.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c -+++ b/CryptoPkg/Library/OpensslLib/openssl/crypto/x509/x509_cmp.c -@@ -39,6 +39,7 @@ unsigned long X509_issuer_and_serial_hash(X509 *a) - - if (ctx == NULL) - goto err; -+ EVP_MD_CTX_set_flags(ctx, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW); - f = X509_NAME_oneline(a->cert_info.issuer, NULL, 0); - if (!EVP_DigestInit_ex(ctx, EVP_md5(), NULL)) - goto err; --- -2.17.0 - diff --git a/sources b/sources index 993de36..660fae5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (qemu-ovmf-secureboot-1.1.3.tar.gz) = f830a525f66379e8e3c61d006fab49547e6709f7aa0f95e70f23c7d26407cc804a0ced9dcfd26af63391d603e9cb5a0714c222c7cdca8599e41852e22e13be80 -SHA512 (openssl-1.1.0h-hobbled.tar.xz) = 6b544a5560a0a3d59b368e3f216284e79389112c87bb34289f8f6644a2454407161a1755b292e8045ff7c172237b070973b03610fd1da3d5204f4118a8644724 -SHA512 (edk2-20180815-cb5f4f45ce.tar.xz) = 2912bb30b5be1d7efc1b7aa6d337fd1403fc9ea7cfc580c22dd770d82273ce4c801eba2d60a6f2fda4bc1c6e49747be606de4acfdcca286c10e44b11369cde9d +SHA512 (edk2-edk2-stable201903.tar.gz) = 44021473e137b0b7863608192badbee154aa2fe49f71b476597d83fa4046ae0f6b174acc27c4b7b185925ea9627b357bb444d98fc027031064645da91c54e0df +SHA512 (openssl-1.1.0j-hobbled.tar.xz) = 9d2c24a634d4669742f2ac78196def4b9f35dd9977aca375c1edbc0b20cbeb62c651cbcd106e6d485a1d83d2c35f60cc0acf24b158ed685cc1780ed4415ceecf