93 lines
3.0 KiB
Diff
93 lines
3.0 KiB
Diff
From dca56cf4d28bbbb1d3be029ce9a6710cb3f6cd2f Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Thu, 4 Jun 2020 13:34:12 +0200
|
|
Subject: BaseTools: do not build BrotliCompress (RH only)
|
|
|
|
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
|
|
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
|
|
|
|
- no change
|
|
|
|
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
|
|
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
|
|
|
|
- New patch.
|
|
|
|
BrotliCompress is not used for building ArmVirtPkg or OvmfPkg platforms.
|
|
It depends on one of the upstream Brotli git submodules that we removed
|
|
earlier in this rebase series. (See patch "remove upstream edk2's Brotli
|
|
submodules (RH only").
|
|
|
|
Do not attempt to build BrotliCompress.
|
|
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
(cherry picked from commit db8ccca337e2c5722c1d408d2541cf653d3371a2)
|
|
---
|
|
BaseTools/Source/C/GNUmakefile | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
|
|
index 8c191e0c38..3eae824a1c 100644
|
|
--- a/BaseTools/Source/C/GNUmakefile
|
|
+++ b/BaseTools/Source/C/GNUmakefile
|
|
@@ -48,7 +48,6 @@ all: makerootdir subdirs
|
|
LIBRARIES = Common
|
|
VFRAUTOGEN = VfrCompile/VfrLexer.h
|
|
APPLICATIONS = \
|
|
- BrotliCompress \
|
|
VfrCompile \
|
|
EfiRom \
|
|
GenFfs \
|
|
--
|
|
2.27.0
|
|
|
|
From 9729dd1d6b83961d531e29777d0cc4a610b108be Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Thu, 4 Jun 2020 13:39:08 +0200
|
|
Subject: MdeModulePkg: remove package-private Brotli include path (RH only)
|
|
|
|
Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] ->
|
|
RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase:
|
|
|
|
- no change
|
|
|
|
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
|
|
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
|
|
|
|
- New patch.
|
|
|
|
Originating from upstream commit 58802e02c41b
|
|
("MdeModulePkg/BrotliCustomDecompressLib: Make brotli a submodule",
|
|
2020-04-16), "MdeModulePkg/MdeModulePkg.dec" contains a package-internal
|
|
include path into a Brotli submodule.
|
|
|
|
The edk2 build system requires such include paths to resolve successfully,
|
|
regardless of the firmware platform being built. Because
|
|
BrotliCustomDecompressLib is not consumed by any OvmfPkg or ArmVirtPkg
|
|
platforms, and we've removed the submodule earlier in this patch set,
|
|
remove the include path too.
|
|
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
(cherry picked from commit e05e0de713c4a2b8adb6ff9809611f222bfe50ed)
|
|
---
|
|
MdeModulePkg/MdeModulePkg.dec | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
|
|
index 8d38383915..ba2d0290e7 100644
|
|
--- a/MdeModulePkg/MdeModulePkg.dec
|
|
+++ b/MdeModulePkg/MdeModulePkg.dec
|
|
@@ -26,9 +26,6 @@
|
|
Include
|
|
Test/Mock/Include
|
|
|
|
-[Includes.Common.Private]
|
|
- Library/BrotliCustomDecompressLib/brotli/c/include
|
|
-
|
|
[LibraryClasses]
|
|
## @libraryclass Defines a set of methods to reset whole system.
|
|
ResetSystemLib|Include/Library/ResetSystemLib.h
|
|
--
|
|
2.27.0
|
|
|