Hello community, here is the log from the commit of package ovmf for openSUSE:Factory:NonFree checked in at 2015-07-12 22:53:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/ovmf (Old) and /work/SRC/openSUSE:Factory:NonFree/.ovmf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ovmf" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/ovmf/ovmf.changes 2015-06-24 21:07:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.ovmf.new/ovmf.changes 2015-07-12 22:53:36.000000000 +0200 @@ -1,0 +2,40 @@ +Wed Jul 8 07:30:18 UTC 2015 - [email protected] + +- Update to R17883 + + MdePkg: Add UEFI2.5 Ramdisk device path definition + + ArmVirtPkg: use correct ASM decoration for non-function global + symbols + + NetworkPkg: Add UEFI HTTP boot driver + + NetworkPkg: Add HTTP Driver + + NetworkPkg: Add DNS feature support over IPv4 and IPv6 + + MdeModulePkg: Update Ip4Dxe driver to support Ip4Config2 + protocol + + ArmVirtPkg: adapt ArmVirtXen build to system memory end global + variable + + ArmPkg/CpuDxe: Fixed AArch64 MMU + + ArmPkg/Application: Add new EFI application to boot Linux + + ArmVirtPkg: build runtime drivers with 64 KB section alignment + + Restructure AuthVariableLib + + Conversion of the safe string functions + + CryptoPkg: Fix the dereferenced pointer issue + + SecurityPkg: Add MD5 support to Hash2DxeCrypto + + OvmfPkg: Increase the maximum size of RAM + + ArmVirtPkg: signal EndOxDxe event in PlatformBsdInit + + MdeModulePkg: Add Memory Capabilities for MMIO and Reserved + Range +- Add ovmf-remove-old-ip4config.patch to remove the old Ip4Config +- Refresh patches + + ovmf-embed-default-keys.patch + + ovmf-gcc5-conf.patch + + 0001-ArmPlatformPkg-ArmVirtualizationPkg-enable-DEBUG_VER.patch + + 0002-ArmPlatformPkg-Bds-generate-ESP-Image-boot-option-if.patch + + 0003-ArmPlatformPkg-Bds-check-for-other-defaults-too-if-u.patch + + 0004-ArmPlatformPkg-ArmVirtualizationPkg-auto-detect-boot.patch + + 0005-ArmPlatformPkg-Bds-initialize-ConIn-ConOut-ErrOut-be.patch + + 0006-ArmPlatformPkg-Bds-let-FindCandidate-search-all-file.patch + + 0007-ArmPlatformPkg-Bds-FindCandidateOnHandle-log-full-de.patch + + 0008-ArmPlatformPkg-Bds-fall-back-to-Boot-Menu-when-no-de.patch + + 0009-ArmPlatformPkg-Bds-always-connect-drivers-before-loo.patch +- Add the source-level debugging to README + +------------------------------------------------------------------- Old: ---- ovmf-0.1+svn17700.tar.xz New: ---- ovmf-0.1+svn17883.tar.xz ovmf-remove-old-ip4config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ovmf.spec ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -24,7 +24,7 @@ Summary: Open Virtual Machine Firmware License: BSD-2-Clause Group: System/Emulators/PC -Version: 0.1+svn17700 +Version: 0.1+svn17883 Release: 0 Source0: %{name}-%{version}.tar.xz Source1: https://www.openssl.org/source/openssl-1.0.2c.tar.gz @@ -66,6 +66,7 @@ # PATCH-FIX-OPENSUSE 0010-avoid-potentially-uninitialized-variable.diff bnc#123456 you@foo -- descr Patch13: 0010-avoid-potentially-uninitialized-variable.diff Patch14: ovmf-gcc5-conf.patch +Patch15: ovmf-remove-old-ip4config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libuuid-devel BuildRequires: fdupes @@ -174,6 +175,7 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 # Intel has special patches for openssl pushd CryptoPkg/Library/OpensslLib/openssl-1.0.2c patch -p0 -i ../EDKII_openssl-1.0.2c.patch @@ -258,11 +260,11 @@ build_with_keys() { suffix="$1" - xxd -i Default_PK > SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_PK.h - xxd -i Default_KEK > SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_KEK.h - xxd -i Default_DB > SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DB.h + xxd -i Default_PK > SecurityPkg/Library/AuthVariableLib/Default_PK.h + xxd -i Default_KEK > SecurityPkg/Library/AuthVariableLib/Default_KEK.h + xxd -i Default_DB > SecurityPkg/Library/AuthVariableLib/Default_DB.h if [ -e Default_DBX ]; then - xxd -i Default_DBX > SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DBX.h + xxd -i Default_DBX > SecurityPkg/Library/AuthVariableLib/Default_DBX.h fi build $BUILD_OPTIONS cp Build/OvmfX64/DEBUG_*/FV/OVMF.fd ovmf-x86_64-$suffix.bin ++++++ 0001-ArmPlatformPkg-ArmVirtualizationPkg-enable-DEBUG_VER.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From 9027904a0785924a8e8af7adb9c28c26ce249100 Mon Sep 17 00:00:00 2001 +From 2912c84763b02d0aa48103d4d7c89d0043237ea5 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Sun, 21 Sep 2014 23:12:09 +0200 Subject: [PATCH 1/9] ArmPlatformPkg/ArmVirtualizationPkg: enable DEBUG_VERBOSE @@ -10,10 +10,10 @@ 1 file changed, 1 insertion(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 374cf7a..b0ed8d9 100644 +index 0671469..ae9aed1 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -98,6 +98,7 @@ +@@ -99,6 +99,7 @@ gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE [PcdsFixedAtBuild.common] ++++++ 0002-ArmPlatformPkg-Bds-generate-ESP-Image-boot-option-if.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From 0ce6ae398c6aace0a1331330eb07d9092d03a2f9 Mon Sep 17 00:00:00 2001 +From 66f97dc3724c0f9c7823b37ae8d1c1133c747a43 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Wed, 27 Nov 2013 01:07:05 +0100 Subject: [PATCH 2/9] ArmPlatformPkg/Bds: generate ESP Image boot option if @@ -109,13 +109,13 @@ // Create the entry is the Default values are correct if (BootDevicePath != NULL) { diff --git a/ArmPlatformPkg/Bds/Bds.inf b/ArmPlatformPkg/Bds/Bds.inf -index e04c86d..ad10045 100644 +index f4c0f1c..1c6c8bf 100644 --- a/ArmPlatformPkg/Bds/Bds.inf +++ b/ArmPlatformPkg/Bds/Bds.inf -@@ -53,6 +53,7 @@ - gEfiEndOfDxeEventGroupGuid +@@ -55,6 +55,7 @@ gEfiFileSystemInfoGuid gArmGlobalVariableGuid + gFdtVariableGuid + gEfiPartTypeSystemPartGuid [Protocols] ++++++ 0003-ArmPlatformPkg-Bds-check-for-other-defaults-too-if-u.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From 4485503a18aa9279038475adc0957f44b685f11b Mon Sep 17 00:00:00 2001 +From 69f2a53baf9985fc08c494df2faba72ccde8b726 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Fri, 13 Dec 2013 22:02:37 +0100 Subject: [PATCH 3/9] ArmPlatformPkg/Bds: check for other defaults too if user @@ -100,10 +100,10 @@ } if (EFI_ERROR (Status)) { diff --git a/ArmPlatformPkg/Bds/Bds.inf b/ArmPlatformPkg/Bds/Bds.inf -index ad10045..d9a8a4c 100644 +index 1c6c8bf..d30fbb0 100644 --- a/ArmPlatformPkg/Bds/Bds.inf +++ b/ArmPlatformPkg/Bds/Bds.inf -@@ -66,6 +66,7 @@ +@@ -68,6 +68,7 @@ gEfiFirmwareVolumeBlock2ProtocolGuid gEfiDhcp4ServiceBindingProtocolGuid gEfiMtftp4ServiceBindingProtocolGuid ++++++ 0004-ArmPlatformPkg-ArmVirtualizationPkg-auto-detect-boot.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From 05ef0ad43caa8c7e0cfc313ce3cb86bed2b02313 Mon Sep 17 00:00:00 2001 +From 21b5731ae18ca386455563e93e8a8cdeb87acadb Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Sun, 21 Sep 2014 23:16:14 +0200 Subject: [PATCH 4/9] ArmPlatformPkg/ArmVirtualizationPkg: auto-detect boot @@ -11,10 +11,10 @@ 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index b0ed8d9..e3314c0 100644 +index ae9aed1..61ddf57 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -130,9 +130,9 @@ +@@ -131,9 +131,9 @@ # # ARM OS Loader # ++++++ 0005-ArmPlatformPkg-Bds-initialize-ConIn-ConOut-ErrOut-be.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From 8ab4f0711f7876a57d64d2ff308e8a1c65400e2f Mon Sep 17 00:00:00 2001 +From 5e4278d12c5bf8c40b7c0b431fda4f67b133cfc9 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Fri, 17 Oct 2014 01:06:38 +0200 Subject: [PATCH 5/9] ArmPlatformPkg/Bds: initialize ConIn/ConOut/ErrOut before ++++++ 0006-ArmPlatformPkg-Bds-let-FindCandidate-search-all-file.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From b0d7379c5835e2e9da01b9738165028af5ea2c5a Mon Sep 17 00:00:00 2001 +From 85e6b5da3155e279c2bc5541e19c60f07ceacbe4 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Thu, 13 Nov 2014 15:18:41 +0100 Subject: [PATCH 6/9] ArmPlatformPkg/Bds: let FindCandidate() search all ++++++ 0007-ArmPlatformPkg-Bds-FindCandidateOnHandle-log-full-de.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From 5506fbab9510b7707e5b0d75e00c51ec09a7c917 Mon Sep 17 00:00:00 2001 +From 2352cd9cecafafb1e113d982101f82dcc09496d0 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Thu, 13 Nov 2014 15:18:42 +0100 Subject: [PATCH 7/9] ArmPlatformPkg/Bds: FindCandidateOnHandle(): log full @@ -50,10 +50,10 @@ CloseRoot: RootDir->Close (RootDir); diff --git a/ArmPlatformPkg/Bds/Bds.inf b/ArmPlatformPkg/Bds/Bds.inf -index d9a8a4c..925aa17 100644 +index d30fbb0..6be7320 100644 --- a/ArmPlatformPkg/Bds/Bds.inf +++ b/ArmPlatformPkg/Bds/Bds.inf -@@ -48,6 +48,7 @@ +@@ -49,6 +49,7 @@ PrintLib BaseLib NetLib ++++++ 0008-ArmPlatformPkg-Bds-fall-back-to-Boot-Menu-when-no-de.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From a68f1d9b9d04473b8c84a6e37aa0e75c29dd4f38 Mon Sep 17 00:00:00 2001 +From 3f7a835f2f8cc76375764e3885c5af5bd810bcec Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Fri, 21 Nov 2014 02:52:56 +0100 Subject: [PATCH 8/9] ArmPlatformPkg/Bds: fall back to Boot Menu when no ++++++ 0009-ArmPlatformPkg-Bds-always-connect-drivers-before-loo.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,4 +1,4 @@ -From 442195b81371d1d2c9110148c7fc273769ac7ebd Mon Sep 17 00:00:00 2001 +From f59d5410e06c02766fae2ee89357663a61a9e706 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <[email protected]> Date: Fri, 21 Nov 2014 03:40:53 +0100 Subject: [PATCH 9/9] ArmPlatformPkg/Bds: always connect drivers before looking ++++++ README ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -43,7 +43,8 @@ ovmf-*-code.bin and ovmf-*-vars.bin, and all non-volatile variables will be stored in ovmf-*-vars.bin. Example: -qemu-system-x86_64 -pflash ovmf-x86_64-code.bin -pflash ovmf-x86_64-vars.bin +qemu-system-x86_64 -drive if=pflash,format=raw,readonly,file=ovmf-x86_64-code.bin \ + -drive if=pflash,format=raw,file=ovmf-x86_64-vars.bin It would be easier to manage the NV variables with the separated vars firmware. @@ -138,3 +139,23 @@ For AArch32: qemu-system-arm -m 1024 -M virt -cpu cortex-a15 -bios /usr/share/qemu/qemu-uefi-aarch32.bin -serial stdio + +Source Level Debugging +====================== +It's possible to debug OVMF with gdb connecting to qemu with the following +steps: + +(1) install the debug package: qemu-ovmf-x86_64-debug + +(2) Start the virtual machine with '-s' or "-gdb tcp::1234" + +(3) Start gdb in another terminal and issue the following commands: + + (gdb) set architecture i386:x86-64:intel + (gdb) target remote localhost:1234 + (gdb) source /usr/share/ovmf-x86_64/gdb_uefi-ovmf-x86_64-<flavor>.py + (gdb) reload-uefi -o /usr/lib/debug/ovmf-x86_64/DebugPkg/GdbSyms/GdbSyms/DEBUG/GdbSyms.dll + +(4) Happy debugging + +Reference: https://www.mail-archive.com/[email protected]/msg07075.html ++++++ ovmf-0.1+svn17700.tar.xz -> ovmf-0.1+svn17883.tar.xz ++++++ /work/SRC/openSUSE:Factory:NonFree/ovmf/ovmf-0.1+svn17700.tar.xz /work/SRC/openSUSE:Factory:NonFree/.ovmf.new/ovmf-0.1+svn17883.tar.xz differ: char 26, line 1 ++++++ ovmf-embed-default-keys.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,47 +1,50 @@ -From 718b2183d898df8ca9becb2e5945cdb53c4fd310 Mon Sep 17 00:00:00 2001 +From 395072acee83ee24d4ebb153953405a09fdeaa50 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin <[email protected]> Date: Fri, 10 May 2013 10:27:51 +0800 -Subject: [PATCH 1/2] Add a stub to allow keys to be embedded at build time +Subject: [PATCH] Add a stub to allow keys to be embedded at build time Signed-off-by: Gary Ching-Pang Lin <[email protected]> --- - .../VariableAuthenticated/RuntimeDxe/AuthService.c | 173 +++++++++++++++++++++ - .../VariableAuthenticated/RuntimeDxe/Default_DB.h | 2 + - .../VariableAuthenticated/RuntimeDxe/Default_KEK.h | 2 + - .../VariableAuthenticated/RuntimeDxe/Default_PK.h | 2 + - .../RuntimeDxe/VariableRuntimeDxe.inf | 3 + - 5 files changed, 182 insertions(+) - create mode 100644 SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DB.h - create mode 100644 SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_KEK.h - create mode 100644 SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_PK.h + .../Library/AuthVariableLib/AuthVariableLib.c | 180 +++++++++++++++++++++ + .../Library/AuthVariableLib/AuthVariableLib.inf | 4 + + SecurityPkg/Library/AuthVariableLib/Default_DB.h | 2 + + SecurityPkg/Library/AuthVariableLib/Default_DBX.h | 2 + + SecurityPkg/Library/AuthVariableLib/Default_KEK.h | 2 + + SecurityPkg/Library/AuthVariableLib/Default_PK.h | 2 + + 6 files changed, 192 insertions(+) + create mode 100644 SecurityPkg/Library/AuthVariableLib/Default_DB.h + create mode 100644 SecurityPkg/Library/AuthVariableLib/Default_DBX.h + create mode 100644 SecurityPkg/Library/AuthVariableLib/Default_KEK.h + create mode 100644 SecurityPkg/Library/AuthVariableLib/Default_PK.h -diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c -index 1e9e190..03c8e26 100644 ---- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c -+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c -@@ -32,6 +32,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +diff --git a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c b/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c +index 0bb0918..321a889 100644 +--- a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c ++++ b/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.c +@@ -23,6 +23,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + **/ - #include "Variable.h" - #include "AuthService.h" + #include "AuthServiceInternal.h" +#include "Default_PK.h" +#include "Default_KEK.h" +#include "Default_DB.h" ++#include "Default_DBX.h" /// /// Global database array for scratch -@@ -145,6 +148,11 @@ AutenticatedVariableServiceInitialize ( - UINT8 SecureBootEnable; - UINT8 CustomMode; - UINT32 ListSize; -+ EFI_SIGNATURE_LIST *SigCert; -+ EFI_SIGNATURE_DATA *SigCertData; -+ UINTN SigSize; -+ EFI_GUID *SignatureGUID; -+ UINT32 Attr; +@@ -136,6 +140,11 @@ AuthVariableLibInitialize ( + UINT8 SecureBootEnable; + UINT8 CustomMode; + UINT32 ListSize; ++ EFI_SIGNATURE_LIST *SigCert; ++ EFI_SIGNATURE_DATA *SigCertData; ++ UINTN SigSize; ++ EFI_GUID *SignatureGUID; ++ UINT32 Attr; - // - // Initialize hash context. -@@ -155,6 +163,171 @@ AutenticatedVariableServiceInitialize ( + if ((AuthVarLibContextIn == NULL) || (AuthVarLibContextOut == NULL)) { + return EFI_INVALID_PARAMETER; +@@ -152,6 +161,177 @@ AuthVariableLibInitialize ( return EFI_OUT_OF_RESOURCES; } @@ -55,286 +58,217 @@ + if (Default_PK == NULL) + goto SKIP_KEYS; + -+ SignatureGUID = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID)); -+ if (SignatureGUID == NULL) { -+ return EFI_OUT_OF_RESOURCES; -+ } -+ -+ SigSize = sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_DATA) - 1 + Default_PK_len; -+ Data = AllocateZeroPool (SigSize); -+ if (Data == NULL) { -+ return EFI_OUT_OF_RESOURCES; -+ } -+ -+ SigCert = (EFI_SIGNATURE_LIST*) Data; -+ SigCert->SignatureListSize = (UINT32) SigSize; -+ SigCert->SignatureHeaderSize = 0; -+ SigCert->SignatureSize = (UINT32) (sizeof(EFI_SIGNATURE_DATA) - 1 + Default_PK_len); -+ CopyGuid (&SigCert->SignatureType, &gEfiCertX509Guid); -+ -+ SigCertData = (EFI_SIGNATURE_DATA*) ((UINT8* ) SigCert + sizeof (EFI_SIGNATURE_LIST)); -+ CopyGuid (&SigCertData->SignatureOwner, SignatureGUID); -+ CopyMem ((UINT8* ) (SigCertData->SignatureData), Default_PK, Default_PK_len); -+ -+ Status = FindVariable ( ++ Status = AuthServiceInternalFindVariable ( + EFI_PLATFORM_KEY_NAME, + &gEfiGlobalVariableGuid, -+ &Variable, -+ &mVariableModuleGlobal->VariableGlobal, -+ FALSE ++ (VOID **) &Data, ++ &DataSize + ); -+ if (Variable.CurrPtr == NULL) { -+ Status = UpdateVariable ( ++ if (Status == EFI_NOT_FOUND) { ++ SignatureGUID = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID)); ++ if (SignatureGUID == NULL) { ++ return EFI_OUT_OF_RESOURCES; ++ } ++ ++ SigSize = sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_DATA) - 1 + Default_PK_len; ++ Data = AllocateZeroPool (SigSize); ++ if (Data == NULL) { ++ return EFI_OUT_OF_RESOURCES; ++ } ++ ++ SigCert = (EFI_SIGNATURE_LIST*) Data; ++ SigCert->SignatureListSize = (UINT32) SigSize; ++ SigCert->SignatureHeaderSize = 0; ++ SigCert->SignatureSize = (UINT32) (sizeof(EFI_SIGNATURE_DATA) - 1 + Default_PK_len); ++ CopyGuid (&SigCert->SignatureType, &gEfiCertX509Guid); ++ ++ SigCertData = (EFI_SIGNATURE_DATA*) ((UINT8* ) SigCert + sizeof (EFI_SIGNATURE_LIST)); ++ CopyGuid (&SigCertData->SignatureOwner, SignatureGUID); ++ CopyMem ((UINT8* ) (SigCertData->SignatureData), Default_PK, Default_PK_len); ++ ++ Status = AuthServiceInternalUpdateVariable ( + EFI_PLATFORM_KEY_NAME, + &gEfiGlobalVariableGuid, + Data, + SigSize, -+ Attr, -+ 0, -+ 0, -+ &Variable, -+ NULL ++ Attr + ); ++ FreePool(SignatureGUID); ++ FreePool(Data); ++ + if (EFI_ERROR (Status)) { + return Status; + } + } + -+ FreePool(SignatureGUID); -+ FreePool(Data); -+ + // KEK + if (Default_KEK == NULL) + goto SKIP_KEYS; + -+ SignatureGUID = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID)); -+ if (SignatureGUID == NULL) { -+ return EFI_OUT_OF_RESOURCES; -+ } -+ -+ SigSize = sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_DATA) - 1 + Default_KEK_len; -+ Data = AllocateZeroPool (SigSize); -+ if (Data == NULL) { -+ return EFI_OUT_OF_RESOURCES; -+ } -+ -+ SigCert = (EFI_SIGNATURE_LIST*) Data; -+ SigCert->SignatureListSize = (UINT32) SigSize; -+ SigCert->SignatureHeaderSize = 0; -+ SigCert->SignatureSize = (UINT32) (sizeof(EFI_SIGNATURE_DATA) - 1 + Default_KEK_len); -+ CopyGuid (&SigCert->SignatureType, &gEfiCertX509Guid); -+ -+ SigCertData = (EFI_SIGNATURE_DATA*) ((UINT8* ) SigCert + sizeof (EFI_SIGNATURE_LIST)); -+ CopyGuid (&SigCertData->SignatureOwner, SignatureGUID); -+ CopyMem ((UINT8* ) (SigCertData->SignatureData), Default_KEK, Default_KEK_len); -+ -+ Status = FindVariable ( ++ Status = AuthServiceInternalFindVariable ( + EFI_KEY_EXCHANGE_KEY_NAME, + &gEfiGlobalVariableGuid, -+ &Variable, -+ &mVariableModuleGlobal->VariableGlobal, -+ FALSE ++ (VOID **) &Data, ++ &DataSize + ); -+ if (Variable.CurrPtr == NULL) { -+ Status = UpdateVariable ( ++ if (Status == EFI_NOT_FOUND) { ++ SignatureGUID = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID)); ++ if (SignatureGUID == NULL) { ++ return EFI_OUT_OF_RESOURCES; ++ } ++ ++ SigSize = sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_DATA) - 1 + Default_KEK_len; ++ Data = AllocateZeroPool (SigSize); ++ if (Data == NULL) { ++ return EFI_OUT_OF_RESOURCES; ++ } ++ ++ SigCert = (EFI_SIGNATURE_LIST*) Data; ++ SigCert->SignatureListSize = (UINT32) SigSize; ++ SigCert->SignatureHeaderSize = 0; ++ SigCert->SignatureSize = (UINT32) (sizeof(EFI_SIGNATURE_DATA) - 1 + Default_KEK_len); ++ CopyGuid (&SigCert->SignatureType, &gEfiCertX509Guid); ++ ++ SigCertData = (EFI_SIGNATURE_DATA*) ((UINT8* ) SigCert + sizeof (EFI_SIGNATURE_LIST)); ++ CopyGuid (&SigCertData->SignatureOwner, SignatureGUID); ++ CopyMem ((UINT8* ) (SigCertData->SignatureData), Default_KEK, Default_KEK_len); ++ ++ Status = AuthServiceInternalUpdateVariable ( + EFI_KEY_EXCHANGE_KEY_NAME, + &gEfiGlobalVariableGuid, + Data, + SigSize, -+ Attr, -+ 0, -+ 0, -+ &Variable, -+ NULL ++ Attr + ); ++ FreePool(SignatureGUID); ++ FreePool(Data); ++ + if (EFI_ERROR (Status)) { + return Status; + } + } + -+ FreePool(SignatureGUID); -+ FreePool(Data); -+ + // DB + if (Default_DB == NULL) + goto SKIP_KEYS; + -+ SignatureGUID = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID)); -+ if (SignatureGUID == NULL) { -+ return EFI_OUT_OF_RESOURCES; -+ } -+ -+ SigSize = sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_DATA) - 1 + Default_DB_len; -+ Data = AllocateZeroPool (SigSize); -+ if (Data == NULL) { -+ return EFI_OUT_OF_RESOURCES; -+ } -+ -+ SigCert = (EFI_SIGNATURE_LIST*) Data; -+ SigCert->SignatureListSize = (UINT32) SigSize; -+ SigCert->SignatureHeaderSize = 0; -+ SigCert->SignatureSize = (UINT32) (sizeof(EFI_SIGNATURE_DATA) - 1 + Default_DB_len); -+ CopyGuid (&SigCert->SignatureType, &gEfiCertX509Guid); -+ -+ SigCertData = (EFI_SIGNATURE_DATA*) ((UINT8* ) SigCert + sizeof (EFI_SIGNATURE_LIST)); -+ CopyGuid (&SigCertData->SignatureOwner, SignatureGUID); -+ CopyMem ((UINT8* ) (SigCertData->SignatureData), Default_DB, Default_DB_len); -+ -+ Status = FindVariable ( ++ Status = AuthServiceInternalFindVariable ( + EFI_IMAGE_SECURITY_DATABASE, + &gEfiImageSecurityDatabaseGuid, -+ &Variable, -+ &mVariableModuleGlobal->VariableGlobal, -+ FALSE ++ (VOID **) &Data, ++ &DataSize + ); -+ if (Variable.CurrPtr == NULL) { -+ Status = UpdateVariable ( ++ if (Status == EFI_NOT_FOUND) { ++ SignatureGUID = (EFI_GUID *) AllocateZeroPool (sizeof (EFI_GUID)); ++ if (SignatureGUID == NULL) { ++ return EFI_OUT_OF_RESOURCES; ++ } ++ ++ SigSize = sizeof(EFI_SIGNATURE_LIST) + sizeof(EFI_SIGNATURE_DATA) - 1 + Default_DB_len; ++ Data = AllocateZeroPool (SigSize); ++ if (Data == NULL) { ++ return EFI_OUT_OF_RESOURCES; ++ } ++ ++ SigCert = (EFI_SIGNATURE_LIST*) Data; ++ SigCert->SignatureListSize = (UINT32) SigSize; ++ SigCert->SignatureHeaderSize = 0; ++ SigCert->SignatureSize = (UINT32) (sizeof(EFI_SIGNATURE_DATA) - 1 + Default_DB_len); ++ CopyGuid (&SigCert->SignatureType, &gEfiCertX509Guid); ++ ++ SigCertData = (EFI_SIGNATURE_DATA*) ((UINT8* ) SigCert + sizeof (EFI_SIGNATURE_LIST)); ++ CopyGuid (&SigCertData->SignatureOwner, SignatureGUID); ++ CopyMem ((UINT8* ) (SigCertData->SignatureData), Default_DB, Default_DB_len); ++ ++ Status = AuthServiceInternalUpdateVariable ( + EFI_IMAGE_SECURITY_DATABASE, + &gEfiImageSecurityDatabaseGuid, + Data, + SigSize, -+ Attr, -+ 0, -+ 0, -+ &Variable, -+ NULL ++ Attr + ); ++ FreePool(SignatureGUID); ++ FreePool(Data); ++ + if (EFI_ERROR (Status)) { + return Status; + } + } + -+ FreePool(SignatureGUID); -+ FreePool(Data); -+ -+SKIP_KEYS: -+ //**** -+ - // - // Reserve runtime buffer for public key database. The size excludes variable header and name size. - // -diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DB.h b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DB.h -new file mode 100644 -index 0000000..4d13894 ---- /dev/null -+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DB.h -@@ -0,0 +1,2 @@ -+unsigned char *Default_DB = NULL; -+unsigned int Default_DB_len = 0; -diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_KEK.h b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_KEK.h -new file mode 100644 -index 0000000..80883de ---- /dev/null -+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_KEK.h -@@ -0,0 +1,2 @@ -+unsigned char *Default_KEK = NULL; -+unsigned int Default_KEK_len = 0; -diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_PK.h b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_PK.h -new file mode 100644 -index 0000000..23b90e4 ---- /dev/null -+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_PK.h -@@ -0,0 +1,2 @@ -+unsigned char *Default_PK = NULL; -+unsigned int Default_PK_len = 0; -diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf -index cbf7da0..e4ec2e0 100644 ---- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf -+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf -@@ -45,6 +45,9 @@ - AuthService.h - Measurement.c - VarCheck.c -+ Default_PK.h -+ Default_KEK.h -+ Default_DB.h - - [Packages] - MdePkg/MdePkg.dec --- -2.1.4 - - -From cc0bdc4ec72c751f0a6f3925ab5ffd6ada6cd8a8 Mon Sep 17 00:00:00 2001 -From: Gary Ching-Pang Lin <[email protected]> -Date: Wed, 22 Apr 2015 16:20:54 +0800 -Subject: [PATCH 2/2] Add a stub to set the default dbx - -Signed-off-by: Gary Ching-Pang Lin <[email protected]> ---- - .../VariableAuthenticated/RuntimeDxe/AuthService.c | 29 ++++++++++++++++++++++ - .../VariableAuthenticated/RuntimeDxe/Default_DBX.h | 2 ++ - .../RuntimeDxe/VariableRuntimeDxe.inf | 1 + - 3 files changed, 32 insertions(+) - create mode 100644 SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DBX.h - -diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c -index 03c8e26..56bfda4 100644 ---- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c -+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/AuthService.c -@@ -35,6 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - #include "Default_PK.h" - #include "Default_KEK.h" - #include "Default_DB.h" -+#include "Default_DBX.h" - - /// - /// Global database array for scratch -@@ -325,6 +326,34 @@ AutenticatedVariableServiceInitialize ( - FreePool(SignatureGUID); - FreePool(Data); - + // DBX + if (Default_DBX == NULL) + goto SKIP_KEYS; + -+ Status = FindVariable ( ++ Status = AuthServiceInternalFindVariable ( + EFI_IMAGE_SECURITY_DATABASE1, + &gEfiImageSecurityDatabaseGuid, -+ &Variable, -+ &mVariableModuleGlobal->VariableGlobal, -+ FALSE ++ (VOID **) &Data, ++ &DataSize + ); -+ if (Variable.CurrPtr == NULL) { -+ Status = UpdateVariable ( ++ if (Status == EFI_NOT_FOUND) { ++ Status = AuthServiceInternalUpdateVariable ( + EFI_IMAGE_SECURITY_DATABASE1, + &gEfiImageSecurityDatabaseGuid, + Default_DBX, + Default_DBX_len, -+ Attr, -+ 0, -+ 0, -+ &Variable, -+ NULL ++ Attr + ); + if (EFI_ERROR (Status)) { + return Status; + } + } + - SKIP_KEYS: - //**** ++SKIP_KEYS: + // + // Reserve runtime buffer for public key database. The size excludes variable header and name size. + // +diff --git a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf b/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf +index d0c0cc2..552dbb9 100644 +--- a/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf ++++ b/SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf +@@ -33,6 +33,10 @@ + AuthVariableLib.c + AuthService.c + AuthServiceInternal.h ++ Default_PK.h ++ Default_KEK.h ++ Default_DB.h ++ Default_DBX.h -diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DBX.h b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DBX.h + [Packages] + MdePkg/MdePkg.dec +diff --git a/SecurityPkg/Library/AuthVariableLib/Default_DB.h b/SecurityPkg/Library/AuthVariableLib/Default_DB.h +new file mode 100644 +index 0000000..4d13894 +--- /dev/null ++++ b/SecurityPkg/Library/AuthVariableLib/Default_DB.h +@@ -0,0 +1,2 @@ ++unsigned char *Default_DB = NULL; ++unsigned int Default_DB_len = 0; +diff --git a/SecurityPkg/Library/AuthVariableLib/Default_DBX.h b/SecurityPkg/Library/AuthVariableLib/Default_DBX.h new file mode 100644 index 0000000..5fd3cdc --- /dev/null -+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/Default_DBX.h ++++ b/SecurityPkg/Library/AuthVariableLib/Default_DBX.h @@ -0,0 +1,2 @@ +unsigned char *Default_DBX = NULL; +unsigned int Default_DBX_len = 0; -diff --git a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf -index e4ec2e0..b390d0b 100644 ---- a/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf -+++ b/SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf -@@ -48,6 +48,7 @@ - Default_PK.h - Default_KEK.h - Default_DB.h -+ Default_DBX.h - - [Packages] - MdePkg/MdePkg.dec +diff --git a/SecurityPkg/Library/AuthVariableLib/Default_KEK.h b/SecurityPkg/Library/AuthVariableLib/Default_KEK.h +new file mode 100644 +index 0000000..80883de +--- /dev/null ++++ b/SecurityPkg/Library/AuthVariableLib/Default_KEK.h +@@ -0,0 +1,2 @@ ++unsigned char *Default_KEK = NULL; ++unsigned int Default_KEK_len = 0; +diff --git a/SecurityPkg/Library/AuthVariableLib/Default_PK.h b/SecurityPkg/Library/AuthVariableLib/Default_PK.h +new file mode 100644 +index 0000000..23b90e4 +--- /dev/null ++++ b/SecurityPkg/Library/AuthVariableLib/Default_PK.h +@@ -0,0 +1,2 @@ ++unsigned char *Default_PK = NULL; ++unsigned int Default_PK_len = 0; -- 2.1.4 ++++++ ovmf-gcc5-conf.patch ++++++ --- /var/tmp/diff_new_pack.3krHLz/_old 2015-07-12 22:53:38.000000000 +0200 +++ /var/tmp/diff_new_pack.3krHLz/_new 2015-07-12 22:53:38.000000000 +0200 @@ -1,5 +1,14 @@ +From aea67c796c31120e16a1423f4e828339aca758fe Mon Sep 17 00:00:00 2001 +From: Gary Ching-Pang Lin <[email protected]> +Date: Mon, 22 Jun 2015 12:34:55 +0800 +Subject: [PATCH] Add GCC5 config + +--- + BaseTools/Conf/tools_def.template | 148 ++++++++++++++++++++++++++++++++++++++ + 1 file changed, 148 insertions(+) + diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index fd7b4b5..ef130eb 100644 +index 7edd759..f0ea53e 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -184,6 +184,9 @@ DEFINE GCC48_X64_PREFIX = ENV(GCC48_BIN) @@ -14,20 +23,20 @@ DEFINE WIN_IASL_BIN = DEF(WIN_ASL_BIN_DIR)\iasl.exe @@ -344,6 +347,12 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G # Required to build platforms or ACPI tables: - # Intel(r) ACPI Compiler v20101013 from - # http://www.acpica.org/downloads/previous_releases.php + # Intel(r) ACPI Compiler from + # https://acpica.org/downloads +# GCC5 -Linux,Windows- Requires: +# GCC 5 targeting x86_64-linux-gnu, aarch64-linux-gnu, or arm-linux-gnueabi +# Optional: +# Required to build platforms or ACPI tables: -+# Intel(r) ACPI Compiler v20101013 from -+# http://www.acpica.org/downloads/previous_releases.php ++# Intel(r) ACPI Compiler from ++# https://acpica.org/downloads # ELFGCC -Linux- Requires: # GCC(this tool chain uses whatever version of gcc and binutils that is installed in /usr/bin) # Optional: -@@ -3917,6 +3926,22 @@ DEFINE GCC49_AARCH64_DLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON) +@@ -3920,6 +3929,22 @@ DEFINE GCC49_AARCH64_DLINK_FLAGS = DEF(GCC48_AARCH64_DLINK_FLAGS) DEFINE GCC49_ARM_ASLDLINK_FLAGS = DEF(GCC48_ARM_ASLDLINK_FLAGS) - DEFINE GCC49_AARCH64_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) + DEFINE GCC49_AARCH64_ASLDLINK_FLAGS = DEF(GCC48_AARCH64_ASLDLINK_FLAGS) +DEFINE GCC5_IA32_CC_FLAGS = DEF(GCC48_IA32_CC_FLAGS) +DEFINE GCC5_X64_CC_FLAGS = DEF(GCC48_X64_CC_FLAGS) @@ -41,14 +50,14 @@ +DEFINE GCC5_ARM_CC_FLAGS = DEF(GCC48_ARM_CC_FLAGS) +DEFINE GCC5_AARCH64_CC_FLAGS = DEF(GCC48_AARCH64_CC_FLAGS) +DEFINE GCC5_ARM_DLINK_FLAGS = DEF(GCC48_ARM_DLINK_FLAGS) -+DEFINE GCC5_AARCH64_DLINK_FLAGS = DEF(GCC_ARM_AARCH64_DLINK_COMMON) ++DEFINE GCC5_AARCH64_DLINK_FLAGS = DEF(GCC48_AARCH64_DLINK_FLAGS) +DEFINE GCC5_ARM_ASLDLINK_FLAGS = DEF(GCC48_ARM_ASLDLINK_FLAGS) -+DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC_ARM_AARCH64_ASLDLINK_FLAGS) ++DEFINE GCC5_AARCH64_ASLDLINK_FLAGS = DEF(GCC48_AARCH64_ASLDLINK_FLAGS) + #################################################################################### # # Unix GCC And Intel Linux ACPI Compiler -@@ -4610,6 +4635,129 @@ RELEASE_GCC49_AARCH64_CC_FLAGS = DEF(GCC49_AARCH64_CC_FLAGS) -Wno-unused-but-s +@@ -4613,6 +4638,129 @@ RELEASE_GCC49_AARCH64_CC_FLAGS = DEF(GCC49_AARCH64_CC_FLAGS) -Wno-unused-but-s #################################################################################### # @@ -178,3 +187,6 @@ # Cygwin GCC And Intel ACPI Compiler # #################################################################################### +-- +2.1.4 + ++++++ ovmf-remove-old-ip4config.patch ++++++ From: jiaxinwu <[email protected]> Date: Wed, 8 Jul 2015 14:24:31 +0800 Subject: [edk2] [PATCH v2 3/7] OvmfPkg: Remove Ip4ConfigDxe module from OvmfPkg. Version2 update with a proper commit message. Cc: Jordan Justen <[email protected]> Cc: Laszlo Ersek <[email protected]> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: jiaxinwu <[email protected]> --- OvmfPkg/OvmfPkgIa32.dsc | 1 - OvmfPkg/OvmfPkgIa32.fdf | 1 - OvmfPkg/OvmfPkgIa32X64.dsc | 1 - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - OvmfPkg/OvmfPkgX64.dsc | 1 - OvmfPkg/OvmfPkgX64.fdf | 1 - 6 files changed, 6 deletions(-) --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -526,7 +526,6 @@ MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -304,7 +304,6 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkMo INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -533,7 +533,6 @@ MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -304,7 +304,6 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkMo INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -531,7 +531,6 @@ MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -304,7 +304,6 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkMo INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
