diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 13:39:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-08 15:44:20 +0100 |
commit | 251f55374d26b5c24d8833aa87c95432be8b81b2 (patch) | |
tree | d83905b2963e8604ea754d85d1176d2fef417ab3 /meta/recipes-core/packagegroups | |
parent | cdd65a42a8b7c23d3640d341c84e747dfb96d269 (diff) | |
download | poky-251f55374d26b5c24d8833aa87c95432be8b81b2.tar.gz |
cargo: Drop cross-canadian variant and fix/use nativesdk
The cargo-cross-candian variant made no sense as one version of cargo in
the SDK can work for all targets. Replace it with nativesdk-cargo instead.
Move the SDK env to rust-cross-canadian.
(From OE-Core rev: 6d6d135924eff5993736ee58ba8cc5d00ca635f3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/packagegroups')
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb index 0d4f5ec9ef..6d324002a1 100644 --- a/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb +++ b/meta/recipes-core/packagegroups/packagegroup-rust-cross-canadian.bb | |||
@@ -6,12 +6,11 @@ inherit cross-canadian packagegroup | |||
6 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" | 6 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" |
7 | 7 | ||
8 | RUST="rust-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 8 | RUST="rust-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
9 | CARGO="cargo-cross-canadian-${TRANSLATED_TARGET_ARCH}" | ||
10 | RUST_TOOLS="rust-tools-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 9 | RUST_TOOLS="rust-tools-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
11 | 10 | ||
12 | RDEPENDS:${PN} = " \ | 11 | RDEPENDS:${PN} = " \ |
13 | ${@all_multilib_tune_values(d, 'RUST')} \ | 12 | ${@all_multilib_tune_values(d, 'RUST')} \ |
14 | ${@all_multilib_tune_values(d, 'CARGO')} \ | 13 | nativesdk-cargo \ |
15 | rust-cross-canadian-src \ | 14 | rust-cross-canadian-src \ |
16 | ${@all_multilib_tune_values(d, 'RUST_TOOLS')} \ | 15 | ${@all_multilib_tune_values(d, 'RUST_TOOLS')} \ |
17 | " | 16 | " |