diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-23 13:54:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-26 22:09:44 +0100 |
commit | cfc8d6dd641f3c0fb080cccbc2577d0a65858913 (patch) | |
tree | 91c68ce16d7d01ecbe623c24a94ae28c85dc80dc /meta/recipes-devtools/cargo | |
parent | 37b2059a7f42ac16fcb10592da5024796a618c89 (diff) | |
download | poky-cfc8d6dd641f3c0fb080cccbc2577d0a65858913.tar.gz |
cargo: Ensure cargo-cross-canadian doesn't have native/nativesdk versions
native/nativesdk variants of a cross-canadian recipe don't make any
sense so avoid these recipe variants.
(From OE-Core rev: 4ba7fb0b6a5021bca73aade4af390e8e017b491a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cargo')
-rw-r--r-- | meta/recipes-devtools/cargo/cargo.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/cargo/cargo_1.54.0.bb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-devtools/cargo/cargo.inc b/meta/recipes-devtools/cargo/cargo.inc index 58aed254ff..6161c327e8 100644 --- a/meta/recipes-devtools/cargo/cargo.inc +++ b/meta/recipes-devtools/cargo/cargo.inc | |||
@@ -43,8 +43,6 @@ do_install () { | |||
43 | # Needed for pkg-config to be used | 43 | # Needed for pkg-config to be used |
44 | export LIBSSH2_SYS_USE_PKG_CONFIG = "1" | 44 | export LIBSSH2_SYS_USE_PKG_CONFIG = "1" |
45 | 45 | ||
46 | BBCLASSEXTEND = "native nativesdk" | ||
47 | |||
48 | # When building cargo-native we don't have cargo-native to use and depend on, | 46 | # When building cargo-native we don't have cargo-native to use and depend on, |
49 | # so we must use the locally set up snapshot to bootstrap the build. | 47 | # so we must use the locally set up snapshot to bootstrap the build. |
50 | BASEDEPENDS:remove:class-native = "cargo-native" | 48 | BASEDEPENDS:remove:class-native = "cargo-native" |
diff --git a/meta/recipes-devtools/cargo/cargo_1.54.0.bb b/meta/recipes-devtools/cargo/cargo_1.54.0.bb index 1f69615640..175f544d66 100644 --- a/meta/recipes-devtools/cargo/cargo_1.54.0.bb +++ b/meta/recipes-devtools/cargo/cargo_1.54.0.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | require recipes-devtools/rust/rust-source-${PV}.inc | 1 | require recipes-devtools/rust/rust-source-${PV}.inc |
2 | require recipes-devtools/rust/rust-snapshot-${PV}.inc | 2 | require recipes-devtools/rust/rust-snapshot-${PV}.inc |
3 | require cargo.inc | 3 | require cargo.inc |
4 | 4 | BBCLASSEXTEND = "native nativesdk" | |