Re: [Buildroot] [PATCH 1/3] boot/edk2: bump to version edk2-stable202305

[Julien Olivain <ju.o@free.fr>]

Hi Romain, All,

On 18/07/2023 23:57, Romain Naour wrote:
> Hello Julien, Vincent, All,
> 
> Le 01/06/2023 à 15:25, Vincent Stehlé a écrit :
>> On Tue, May 30, 2023 at 10:07:26PM +0200, Julien Olivain wrote:
>>> For change log since version edk2-stable202208, see:
>>> - https://github.com/tianocore/edk2/releases/tag/edk2-stable202211
>>> - https://github.com/tianocore/edk2/releases/tag/edk2-stable202302
>>> - https://github.com/tianocore/edk2/releases/tag/edk2-stable202305
>>> 
>>> The main motivation of this bump is the RISC-V QEMU Virt support
>>> introduced in edk2-stable202302 (not yet supported in Buildroot).
>>> 
>>> Cc: Dick Olsson <hi@senzilla.io>
>>> Cc: Vincent Stehlé <vincent.stehle@arm.com>
>>> Signed-off-by: Julien Olivain <ju.o@free.fr>
>>> ---
>>> Patch series tested on branch master at commit c765ac9 with commands:
>>> 
>>>     utils/docker-run make check-package
>>>     ...
>>>     0 warnings generated
>>> 
>>>     support/testing/run-tests \
>>>         -d dl -o output_folder \
>>>         tests.boot.test_edk2
>>>     ...
>>>     OK
>>> 
>>>     make qemu_aarch64_sbsa_defconfig
>>>     make
>>>     ...
>>>     output/images/start-qemu.sh
>>>     ...
>>>     buildroot login:
>> 
>> Hi Julien,
>> 
>> Thanks for those patches!
>> 
>> I did test the following on my side without issue:
>> 
>>   qemu_aarch64_sbsa_defconfig
>>   tests.boot.test_edk2.TestEdk2
>>   tests.boot.test_grub.TestGrubAArch64EFI
>>   tests.boot.test_grub.TestGrubX8664EFI
>>   tests.boot.test_grub.TestGrubi386EFI
>>   tests.fs.test_iso9660.TestIso9660Grub2EFI
>>   tests.fs.test_iso9660.TestIso9660Grub2Hybrid
> 
> Thanks for testing but some test in gitlab-ci doesn't boot since this 
> patch has
> been applied:
> 
> https://gitlab.com/buildroot.org/buildroot/-/jobs/4664845865
> https://gitlab.com/buildroot.org/buildroot/-/jobs/4664845861
> https://gitlab.com/buildroot.org/buildroot/-/jobs/4664845777
> https://gitlab.com/buildroot.org/buildroot/-/jobs/4664845773
> 
> "SystemError: System does not boot"
> 
> I reproduced locally with "tests.boot.test_grub.TestGrubX8664EFI" then 
> I
> reverted this commit to boot correctly.
> 
> There is no useful log, the image just hang.
> 
> Can you have a look?

Before sending this patch, I initially successfully ran those tests
using a qemu at v8.0.0 (2023-04-19), same as Buildroot host-qemu at
that time.

I now reproduce those issues with the Buildroot docker image using
utils/docker-run, which includes qemu v5.2.0 (2020-12-08).

After bisecting, I found that qemu commit:
https://gitlab.com/qemu-project/qemu/-/commit/6a3aa014c54535d0ac67516b10ea17778bbafffd
fixes those issues. It's included in QEmu v7.2.1 (2023-04-05). When
using a QEmu version including this commit, the test works.

Updating support/docker/Dockerfile to use
"FROM debian:bookworm-20230703" also fixes those tests, as it includes
qemu-system-x86_64 v7.2.2 (2023-04-23).

I believe edk2-stable202305 is correct and the issue is more on the
qemu 5.2.0 side, included in the Buildroot Docker image.

I'm not sure if it's the right time to update the Buildroot Docker
image from Debian 11 to 12. I also did not tested what other issues
such an update would introduce.

So the options I see right now are:

1. disable the test until the Buildroot Docker image is
updated,

2. or directly update the Docker image soon,

3. or we could eventually investigate to patch edk2 to avoid
triggering this issue.

Any comments or suggestions?

Best regards,

Julien.


> 
> Best regards,
> Romain
> 
> 
>> 
>> Feel free to add (or not):
>> 
>>   Tested-by: Vincent Stehlé <vincent.stehle@arm.com>
> 
> 
> 
>> 
>> Best regards,
>> Vincent.
>> 
>>> ---
>>>  boot/edk2/edk2.hash | 2 +-
>>>  boot/edk2/edk2.mk   | 2 +-
>>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash
>>> index 94ee22ddc4..34d4b10e29 100644
>>> --- a/boot/edk2/edk2.hash
>>> +++ b/boot/edk2/edk2.hash
>>> @@ -1,3 +1,3 @@
>>>  # Locally calculated
>>> -sha256  
>>> c10520f269557d566e35fe8104141aa2865f9085ad2b3a30aae8a7e78a3ca5aa  
>>> edk2-edk2-stable202208-br1.tar.gz
>>> +sha256  
>>> ca55351913e6258ebd8c08106f369ac71073d9cfaa80427fc5f131b06d808940  
>>> edk2-edk2-stable202305-br1.tar.gz
>>>  sha256  
>>> 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80  
>>> License.txt
>>> diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk
>>> index fb6b9a3280..399bd346ef 100644
>>> --- a/boot/edk2/edk2.mk
>>> +++ b/boot/edk2/edk2.mk
>>> @@ -4,7 +4,7 @@
>>>  #
>>>  
>>> ################################################################################
>>> 
>>> -EDK2_VERSION = edk2-stable202208
>>> +EDK2_VERSION = edk2-stable202305
>>>  EDK2_SITE = https://github.com/tianocore/edk2
>>>  EDK2_SITE_METHOD = git
>>>  EDK2_LICENSE = BSD-2-Clause-Patent
>>> --
>>> 2.40.1
>>> 
>> _______________________________________________
>> buildroot mailing list
>> buildroot@buildroot.org
>> https://lists.buildroot.org/mailman/listinfo/buildroot
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot