|
|
fdb3e7 |
From cab35d13e43ef37e746befaa1f3c8200edf4e420 Mon Sep 17 00:00:00 2001
|
|
|
fdb3e7 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
fdb3e7 |
Date: Thu, 4 Jun 2020 13:34:12 +0200
|
|
|
fdb3e7 |
Subject: [PATCH] BaseTools: do not build BrotliCompress (RH only)
|
|
|
fdb3e7 |
|
|
|
fdb3e7 |
Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] ->
|
|
|
fdb3e7 |
RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase:
|
|
|
fdb3e7 |
|
|
|
fdb3e7 |
- New patch.
|
|
|
fdb3e7 |
|
|
|
fdb3e7 |
BrotliCompress is not used for building ArmVirtPkg or OvmfPkg platforms.
|
|
|
fdb3e7 |
It depends on one of the upstream Brotli git submodules that we removed
|
|
|
fdb3e7 |
earlier in this rebase series. (See patch "remove upstream edk2's Brotli
|
|
|
fdb3e7 |
submodules (RH only").
|
|
|
fdb3e7 |
|
|
|
fdb3e7 |
Do not attempt to build BrotliCompress.
|
|
|
fdb3e7 |
|
|
|
fdb3e7 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
fdb3e7 |
---
|
|
|
fdb3e7 |
BaseTools/Source/C/GNUmakefile | 1 -
|
|
|
fdb3e7 |
MdeModulePkg/MdeModulePkg.dec | 1 -
|
|
|
fdb3e7 |
2 files changed, 2 deletions(-)
|
|
|
fdb3e7 |
|
|
|
fdb3e7 |
diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
|
|
|
fdb3e7 |
index df4eb64ea9..52777eaff1 100644
|
|
|
fdb3e7 |
--- a/BaseTools/Source/C/GNUmakefile
|
|
|
fdb3e7 |
+++ b/BaseTools/Source/C/GNUmakefile
|
|
|
fdb3e7 |
@@ -45,7 +45,6 @@ all: makerootdir subdirs
|
|
|
fdb3e7 |
LIBRARIES = Common
|
|
|
fdb3e7 |
VFRAUTOGEN = VfrCompile/VfrLexer.h
|
|
|
fdb3e7 |
APPLICATIONS = \
|
|
|
fdb3e7 |
- BrotliCompress \
|
|
|
fdb3e7 |
VfrCompile \
|
|
|
fdb3e7 |
EfiRom \
|
|
|
fdb3e7 |
GenFfs \
|
|
|
fdb3e7 |
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
|
|
|
fdb3e7 |
index e562bed57e..7367adbaa3 100644
|
|
|
fdb3e7 |
--- a/MdeModulePkg/MdeModulePkg.dec
|
|
|
fdb3e7 |
+++ b/MdeModulePkg/MdeModulePkg.dec
|
|
|
fdb3e7 |
@@ -25,7 +25,6 @@
|
|
|
fdb3e7 |
Include
|
|
|
fdb3e7 |
|
|
|
fdb3e7 |
[Includes.Common.Private]
|
|
|
fdb3e7 |
- Library/BrotliCustomDecompressLib/brotli/c/include
|
|
|
fdb3e7 |
|
|
|
fdb3e7 |
[LibraryClasses]
|
|
|
fdb3e7 |
## @libraryclass Defines a set of methods to reset whole system.
|