[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: roms/efirom, tests/uefi-test-tools: update edk2's own submodules fir

From: Philippe Mathieu-Daudé
Subject: Re: roms/efirom, tests/uefi-test-tools: update edk2's own submodules first
Date: Tue, 20 Oct 2020 11:38:29 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.1

On 10/20/20 11:29 AM, Philippe Mathieu-Daudé wrote:
Hi Olaf,

On 10/20/20 11:16 AM, Olaf Hering wrote:
This is about qemu.git#ec87b5daca761039bbcf781eedbe4987f790836f

On Mon, Sep 07, Laszlo Ersek wrote:

In edk2 commit 06033f5abad3 ("BaseTools: Make brotli a submodule",
2020-04-16), part of edk2-stable202005, the Brotli compressor /
decompressor source code that edk2 had flattened into BaseTools was
replaced with a git submodule.

This means we have to initialize edk2's own submodules before building
BaseTools not just in "roms/Makefile.edk2", but in "roms/Makefile" (for
the sake of the "efirom" target) and "tests/uefi-test-tools/Makefile" as

+++ b/roms/Makefile
+    cd edk2/BaseTools && git submodule update --init --force
+    cd $(edk2_dir)/BaseTools && git submodule update --init --force

This change can not possibly be correct.

With current qemu.git#master one is forced to have network access to
build the roms. This fails with exported (and complete) sources in an
offline environment.

The EDK2 roms are only used for testing, we certainly don't want them
to be used by distributions. I suppose the question is "why is this
rule called if tests are not built?".

Please revert this patch.

Maybe to clarify the use of this submodule:

-- >8 --
Author: Philippe Mathieu-Daudé <philmd@redhat.com>
Date:   Tue Oct 20 11:33:22 2020 +0200

    EDK2 submodule should only be used for testing QEMU

    Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

diff --git a/.gitmodules b/.gitmodules
index 2bdeeacef88..dd9b5ed03e1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -47,7 +47,7 @@
        path = tests/fp/berkeley-softfloat-3
        url = https://git.qemu.org/git/berkeley-softfloat-3.git
 [submodule "roms/edk2"]
-       path = roms/edk2
+ path = roms/edk2-unsafe-with-all-security-features-disabled-only-usable-for-testing
        url = https://git.qemu.org/git/edk2.git
 [submodule "slirp"]
        path = slirp
index a7f0acf8663..35f977efbcc 100644
@@ -2732,7 +2732,7 @@ S: Supported
 F: pc-bios/descriptors/??-edk2-*.json
 F: pc-bios/edk2-*
 F: roms/Makefile.edk2
-F: roms/edk2
+F: roms/edk2-unsafe-with-all-security-features-disabled-only-usable-for-testing
 F: roms/edk2-*
 F: tests/data/uefi-boot-images/
 F: tests/uefi-test-tools/
diff --git a/roms/edk2 b/roms/edk2-unsafe-with-all-security-features-disabled-only-usable-for-testing
similarity index 100%
rename from roms/edk2
rename to roms/edk2-unsafe-with-all-security-features-disabled-only-usable-for-testing

reply via email to

[Prev in Thread] Current Thread [Next in Thread]