You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
91 lines
3.7 KiB
91 lines
3.7 KiB
2 years ago
|
From b7053a8abb865ff58bc92cae6e573ae1e805b602 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
Date: Thu, 24 Mar 2022 03:23:02 -0400
|
||
|
|
Subject: Remove submodules
|
||
|
|
|
||
|
|
Upstream edk2 tracks several submodules we do not need in RHEL (removal
|
||
|
|
done by individual commits in previous RHEL versions):
|
||
|
|
|
||
|
|
- openssl: We use RHEL specific openssl submodule later (commit 48f993088e)
|
||
|
|
- SoftFloat: required only for 32-bit ARM (commit 273787a5c2)
|
||
|
|
- cmocka: needed for UnitTestFrameworkPkg we do not use (commit a2dca9bcd2)
|
||
|
|
- oniguruma: rhel do not need this dependency (commit 73f4b42b3a)
|
||
|
|
- brotli: removed this dependency (commits fcd212ffce, cf62a90767 and ac5782e6ab)
|
||
|
|
- jansson: we do not depend on JSON parsing or formating (commit c84227659a)
|
||
|
|
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
|
||
|
|
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)
|
||
|
|
---
|
||
|
|
.gitmodules | 25 -------------------
|
||
|
|
.../ArmSoftFloatLib/berkeley-softfloat-3 | 1 -
|
||
|
|
BaseTools/Source/C/BrotliCompress/brotli | 1 -
|
||
|
|
BaseTools/Source/C/GNUmakefile | 1 -
|
||
|
|
CryptoPkg/.gitignore | 1 +
|
||
|
|
CryptoPkg/Library/OpensslLib/openssl | 1 -
|
||
|
|
.../Library/BrotliCustomDecompressLib/brotli | 1 -
|
||
|
|
MdeModulePkg/MdeModulePkg.dec | 3 ---
|
||
|
|
.../Universal/RegularExpressionDxe/oniguruma | 1 -
|
||
|
|
RedfishPkg/Library/JsonLib/jansson | 1 -
|
||
|
|
UnitTestFrameworkPkg/Library/CmockaLib/cmocka | 1 -
|
||
|
|
11 files changed, 1 insertion(+), 36 deletions(-)
|
||
|
|
delete mode 160000 ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
|
||
|
|
delete mode 160000 BaseTools/Source/C/BrotliCompress/brotli
|
||
|
|
create mode 100644 CryptoPkg/.gitignore
|
||
|
|
delete mode 160000 CryptoPkg/Library/OpensslLib/openssl
|
||
|
|
delete mode 160000 MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
|
||
|
|
delete mode 160000 MdeModulePkg/Universal/RegularExpressionDxe/oniguruma
|
||
|
|
delete mode 160000 RedfishPkg/Library/JsonLib/jansson
|
||
|
|
delete mode 160000 UnitTestFrameworkPkg/Library/CmockaLib/cmocka
|
||
|
|
|
||
|
|
diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
|
||
|
|
index 5275f657ef..39d7199753 100644
|
||
|
|
--- a/BaseTools/Source/C/GNUmakefile
|
||
|
|
+++ b/BaseTools/Source/C/GNUmakefile
|
||
|
|
@@ -51,7 +51,6 @@ all: makerootdir subdirs
|
||
|
|
LIBRARIES = Common
|
||
|
|
VFRAUTOGEN = VfrCompile/VfrLexer.h
|
||
|
|
APPLICATIONS = \
|
||
|
|
- BrotliCompress \
|
||
|
|
VfrCompile \
|
||
|
|
EfiRom \
|
||
|
|
GenFfs \
|
||
|
|
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
|
||
|
|
index 58e6ab0048..775f1b27af 100644
|
||
|
|
--- a/MdeModulePkg/MdeModulePkg.dec
|
||
|
|
+++ b/MdeModulePkg/MdeModulePkg.dec
|
||
|
|
@@ -24,9 +24,6 @@
|
||
|
|
[Includes]
|
||
|
|
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
|