Re: [Buildroot] [PATCH v2 2/3] boot/edk2: bump to version edk2-stable202405

[Thomas Petazzoni via buildroot <buildroot@buildroot.org>]

On Mon, 28 Oct 2024 21:27:30 +0100
Julien Olivain <ju.o@free.fr> wrote:

> On my side (this series applied on top of branch master at 81e7806),
> this patch does not apply. This can be reproduced with:
> 
>      make qemu_aarch64_sbsa_defconfig
>      make edk2-patch
> 
> Which fails with output:
> 
>      Applying 
> 0001-OvmfPkg-QemuVideoDxe-add-feature-PCD-to-remap-frameb.patch using 
> patch:

I'd say there's a fairly high chance this isn't Romain's fault. I
haven't checked but I would guess that this EDK2 code base uses
DOS-style new lines (\r\n), and so the patches have those, but they get
stripped when going through the mailing list, making the patch
unapplicable.

> When we bumping boot/edk2, we usually also bump edk2-non-osi.
> See:
> https://gitlab.com/buildroot.org/buildroot/-/blob/master/package/edk2-non-osi/edk2-non-osi.mk?ref_type=heads#L7
> 
> Even if it is not needed to fix the qemu_aarch64_sbsa_defconfig of
> this series, it would be better to keep all those components aligned.
> 
> Could you check if edk2-non-osi needs to be updated too?
> If yes, could you update it?
> If no, could you add a mention that it does not need to?
> 
> Maybe we could add a comment in boot/edk2/edk2.mk, before EDK2_VERSION.
> Something like:
> 
> # When updating version, make sure to also update the edk2-platforms
> # and edk2-non-osi packages to their respective commit ID nearest to
> # the edk2 release.

I'll let Romain address this point before applying then.

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot