[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/19] roms/edk2: Only initialize required submodules
From: |
Richard Henderson |
Subject: |
[PULL 06/19] roms/edk2: Only initialize required submodules |
Date: |
Thu, 21 Oct 2021 08:25:28 -0700 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The EDK2 firmware images built to test QEMU do not require
the following submodules:
- MdeModulePkg/Universal/RegularExpressionDxe/oniguruma
- UnitTestFrameworkPkg/Library/CmockaLib/cmocka
The only submodules required are:
- ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
- BaseTools/Source/C/BrotliCompress/brotli
- CryptoPkg/Library/OpensslLib/openssl
- MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
Adapt the buildsys machinery to only initialize the required
submodules.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20211018105816.2663195-3-philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
.gitlab-ci.d/edk2.yml | 6 +++++-
roms/Makefile.edk2 | 7 ++++++-
scripts/make-release | 7 ++++++-
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml
index 62497ba47f..13d0f8b019 100644
--- a/.gitlab-ci.d/edk2.yml
+++ b/.gitlab-ci.d/edk2.yml
@@ -50,7 +50,11 @@ build-edk2:
GIT_DEPTH: 3
script: # Clone the required submodules and build EDK2
- git submodule update --init roms/edk2
- - git -C roms/edk2 submodule update --init
+ - git -C roms/edk2 submodule update --init --
+ ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3
+ BaseTools/Source/C/BrotliCompress/brotli
+ CryptoPkg/Library/OpensslLib/openssl
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli
- export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
- echo "=== Using ${JOBS} simultaneous jobs ==="
- make -j${JOBS} -C roms efi 2>&1 1>edk2-stdout.log | tee -a edk2-stderr.log
>&2
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
index a8ed325575..fdae0b511f 100644
--- a/roms/Makefile.edk2
+++ b/roms/Makefile.edk2
@@ -51,7 +51,12 @@ all: $(foreach
flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \
# make-release/tarball scripts.
submodules:
if test -d edk2/.git; then \
- cd edk2 && git submodule update --init --force; \
+ cd edk2 && git submodule update --init --force -- \
+ ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
+ BaseTools/Source/C/BrotliCompress/brotli \
+ CryptoPkg/Library/OpensslLib/openssl \
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
+ ; \
fi
# See notes on the ".NOTPARALLEL" target and the "+" indicator in
diff --git a/scripts/make-release b/scripts/make-release
index a2a8cda33c..05b14ecc95 100755
--- a/scripts/make-release
+++ b/scripts/make-release
@@ -27,7 +27,12 @@ git submodule update --init
# don't necessarily have much control over how a submodule handles its
# submodule dependencies, so we continue to handle these on a case-by-case
# basis for now.
-(cd roms/edk2 && git submodule update --init)
+(cd roms/edk2 && \
+ git submodule update --init -- \
+ ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
+ BaseTools/Source/C/BrotliCompress/brotli \
+ CryptoPkg/Library/OpensslLib/openssl \
+ MdeModulePkg/Library/BrotliCustomDecompressLib/brotli)
popd
tar --exclude=.git -cjf ${destination}.tar.bz2 ${destination}
rm -rf ${destination}
--
2.25.1
- [PULL 00/19] target/arm patch queue, Richard Henderson, 2021/10/21
- [PULL 00/19] target/arm patch queue, Richard Henderson, 2021/10/21
- [PULL 01/19] tests/acpi: Get prepared for IORT E.b revision upgrade, Richard Henderson, 2021/10/21
- [PULL 02/19] hw/arm/virt-acpi-build: IORT upgrade up to revision E.b, Richard Henderson, 2021/10/21
- [PULL 04/19] hw/arm/virt: Don't create device-tree node for empty NUMA node, Richard Henderson, 2021/10/21
- [PULL 03/19] tests/acpi: Generate reference blob for IORT rev E.b, Richard Henderson, 2021/10/21
- [PULL 06/19] roms/edk2: Only initialize required submodules,
Richard Henderson <=
- [PULL 05/19] roms/edk2: Only init brotli submodule to build BaseTools, Richard Henderson, 2021/10/21
- [PULL 11/19] bios-tables-test: Generate reference table for virt/DBG2, Richard Henderson, 2021/10/21
- [PULL 09/19] tests/acpi: Add void table for virt/DBG2 bios-tables-test, Richard Henderson, 2021/10/21
- [PULL 08/19] hw/elf_ops.h: switch to ssize_t for elf loader return type, Richard Henderson, 2021/10/21
- [PULL 07/19] hw/arm/sbsa-ref: Fixed cpu type error message typo., Richard Henderson, 2021/10/21
- [PULL 12/19] hw/arm/virt: Only describe cpu topology since virt-6.2, Richard Henderson, 2021/10/21
- [PULL 14/19] hw/arm/virt: Add cpu-map to device tree, Richard Henderson, 2021/10/21
- [PULL 15/19] hw/acpi/aml-build: Add Processor hierarchy node structure, Richard Henderson, 2021/10/21
- [PULL 10/19] hw/arm/virt_acpi_build: Generate DBG2 table, Richard Henderson, 2021/10/21
- [PULL 17/19] tests/data/acpi/virt: Add an empty expected file for PPTT, Richard Henderson, 2021/10/21