| Message ID | 20251020150924.84223-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/5] CI: remove meta-clang | expand |
On Mon, 20 Oct 2025 16:09:20 +0100, Jon Mason wrote: > Now that clang is in core, we don't need to use meta-clang anymore. > Also, use PREFERRED_TOOLCHAIN_TARGET to specify the toolchain to use. > > Applied, thanks! [1/5] CI: remove meta-clang commit: 31455d75d1d91755bfc6481d18e8dc6b379d21c3 [2/5] arm/trusted-firmware-a: remove forcing of gcc for qemuarm-secureboot commit: 29bbc0bbf70e32b7f95a7755a4ede8d6ef28d4e7 [3/5] arm/optee-ftpm: enable clang compilation commit: b0325ba0f0874c79961c371f9df78e35a577a9a5 [4/5] arm/edk2-firmware: move the gcc toolchain force to the versioned recipe commit: 4d980ba25bceb1b872ae41d3399d1bc4dd2ace96 [5/5] arm/sgi575: force gcc for tf-a commit: 4300ff31a76c72833a5acb663fae5078dafdf005 Best regards,
diff --git a/ci/clang.yml b/ci/clang.yml index 402292a6b86d..dfe0c36616d0 100644 --- a/ci/clang.yml +++ b/ci/clang.yml @@ -3,10 +3,6 @@ header: version: 14 -repos: - meta-clang: - url: https://github.com/kraj/meta-clang - local_conf_header: toolchain: | - TOOLCHAIN = "clang" + PREFERRED_TOOLCHAIN_TARGET = "clang" diff --git a/ci/gcc.yml b/ci/gcc.yml index 1f368c24dcb1..61e1d0e17791 100644 --- a/ci/gcc.yml +++ b/ci/gcc.yml @@ -3,7 +3,7 @@ header: version: 14 -#NOTE: This is the default for poky. This is only being added for completeness/clarity +#NOTE: This is the default. This is only being added for completeness/clarity local_conf_header: toolchain: | - TOOLCHAIN = "gcc" + PREFERRED_TOOLCHAIN_TARGET = "gcc" diff --git a/ci/update-repos b/ci/update-repos index c44246cc019c..e70ed0d963c6 100755 --- a/ci/update-repos +++ b/ci/update-repos @@ -23,7 +23,6 @@ repositories = ( "https://git.yoctoproject.org/poky", "https://git.openembedded.org/meta-openembedded", "https://git.yoctoproject.org/meta-virtualization", - "https://github.com/kraj/meta-clang", ) if __name__ == "__main__":
Now that clang is in core, we don't need to use meta-clang anymore. Also, use PREFERRED_TOOLCHAIN_TARGET to specify the toolchain to use. Signed-off-by: Jon Mason <jon.mason@arm.com> --- ci/clang.yml | 6 +----- ci/gcc.yml | 4 ++-- ci/update-repos | 1 - 3 files changed, 3 insertions(+), 8 deletions(-)