[pull] master from buildroot:master #423
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Since the bump of xxhash from 0.8.2 to 0.8.3 in Buildroot commit 4b8f2f3, the host of host-php fails when host-xxhash has been built before. This is due to the fact that host-xxhash installs HOST_DIR/include/xxhash.h, and the PHP code has an internal xxhash.h, but due to the order of CFLAGS, the one from HOST_DIR/include/xxhash.h gets included instead of the internal xxhash.h from PHP. We initially tried to fix the order of CFLAGS, but that has proven to be challenging within the complicated PHP build system. Then, we opted for renaming the internal xxhash.h header of PHP, which we had implemented and were about to submit upstream. But while rebasing this fix on PHP's master, it turned out that PHP has an upstream commit "Sync headers installation", merged for PHP 8.4.0, which has the side effect of avoiding the issue. This commit moves xxhash.h into a subfolder, so it gets included as #include "xxhash/xxhash.h" now, which avoids the conflict with HOST_DIR/include/xxhash.h. Maybe not the best fix, but it does fix the issue and it's upstream. Since this patch is tweaking the PHP build system, we need to do the equivalent of "autoreconf" but in the PHP world. It was already done for the target package, we simply add the same logic for the host package. Fixes: http://autobuild.buildroot.net/results/583c054a564f90b8c884565070c5e17b43b89674/ Cc: James Hilliard <[email protected]> Signed-off-by: Thomas Petazzoni <[email protected]> Signed-off-by: Julien Olivain <[email protected]>
Since edk2-202408, ATF >= 2.12 is required for qemu aarch64 sbsa target
to support CPU topology information provided by edk2 firmware [1].
If ATF <= 2.11 is used, the boot will hand with the following error:
sbsa_sip_smc_handler: unhandled SMC (0xc20000ca) (function id: 202)
In order to update edk2 package to a newer version, update ATF version
used by TestFwts to 2.12.
[1] ARM-software/arm-trusted-firmware@c891b4d
Cc: Julien Olivain <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Since edk2-202408, ATF >= 2.12 is required for qemu aarch64 sbsa target
to support CPU topology information provided by edk2 firmware [1].
If ATF <= 2.11 is used, the boot will hand with the following error:
sbsa_sip_smc_handler: unhandled SMC (0xc20000ca) (function id: 202)
In order to update edk2 package to a newer version, update ATF version
used by TestEdk2 to 2.12.
[1] ARM-software/arm-trusted-firmware@c891b4d
Cc: Julien Olivain <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Since edk2-202408, ATF >= 2.12 is required for qemu aarch64 sbsa target
to support CPU topology information provided by edk2 firmware [1].
If ATF <= 2.11 is used, the boot will hand with the following error:
sbsa_sip_smc_handler: unhandled SMC (0xc20000ca) (function id: 202)
In order to update edk2 package to a newer version, update ATF version
used by qemu_aarch64_sbsa_defconfig to 2.12.
[1] ARM-software/arm-trusted-firmware@c891b4d
Cc: Julien Olivain <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
Signed-off-by: Julien Olivain <[email protected]>
Sync edk2-platforms with the last commit merged at the edk2 release date (2024-11-22). See: https://github.com/tianocore/edk2/releases/tag/edk2-stable202411 Runtime tested with tests using EDK2 package: TestFwts, TestEdk2, TestIso9660Grub2EFI, TestIso9660Grub2Hybrid, TestGrubi386EFI, TestGrubX8664EFI, TestGrubAArch64EFI, TestGrubRiscV64EFI. Runtime tested with defconfig using EDK2 package: qemu_aarch64_sbsa_defconfig, qemu_riscv64_virt_efi_defconfig. Cc: Julien Olivain <[email protected]> Signed-off-by: Romain Naour <[email protected]> Signed-off-by: Julien Olivain <[email protected]>
…ve edk2 download fix Remove the download fix introduced by [1] now the edk2 git repository has been fixed in version stable202411 [2]. [1] 47fc9e5. [2] tianocore/edk2@95d8a1c Cc: Julien Olivain <[email protected]> Signed-off-by: Romain Naour <[email protected]> Signed-off-by: Julien Olivain <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )