* [PATCH] rust: remove rust_versions.inc since there can be only one.
@ 2021-09-03 16:20 Randy MacLeod
2021-09-03 16:31 ` [OE-core] " Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Randy MacLeod @ 2021-09-03 16:20 UTC (permalink / raw)
To: openembedded-core
oe-core has only one version of the Rust toolchain,
so remove the ability to change versions.
This file belongs in the meta-rust layer.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
meta/conf/distro/include/rust_versions.inc | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 meta/conf/distro/include/rust_versions.inc
diff --git a/meta/conf/distro/include/rust_versions.inc b/meta/conf/distro/include/rust_versions.inc
deleted file mode 100644
index a11ba22a8f..0000000000
--- a/meta/conf/distro/include/rust_versions.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# include this in your distribution to easily switch between versions
-# just by changing RUST_VERSION variable
-
-RUST_VERSION ?= "1.51.0"
-
-PREFERRED_VERSION_cargo ?= "${RUST_VERSION}"
-PREFERRED_VERSION_cargo-native ?= "${RUST_VERSION}"
-PREFERRED_VERSION_libstd-rs ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-llvm ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-llvm-native ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-native ?= "${RUST_VERSION}"
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] rust: remove rust_versions.inc since there can be only one.
2021-09-03 16:20 [PATCH] rust: remove rust_versions.inc since there can be only one Randy MacLeod
@ 2021-09-03 16:31 ` Khem Raj
2021-09-06 1:26 ` [v2] tcmode-default: add rust to the default toolchains Randy MacLeod
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-09-03 16:31 UTC (permalink / raw)
To: Randy MacLeod, openembedded-core
On 9/3/21 9:20 AM, Randy MacLeod wrote:
> oe-core has only one version of the Rust toolchain,
> so remove the ability to change versions.
> This file belongs in the meta-rust layer.
>
I think we should still keep it around. For external rust toolchains
much like we do for gcc, but move it to
meta/conf/distro/include/tcmode-default.inc
> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
> ---
> meta/conf/distro/include/rust_versions.inc | 13 -------------
> 1 file changed, 13 deletions(-)
> delete mode 100644 meta/conf/distro/include/rust_versions.inc
>
> diff --git a/meta/conf/distro/include/rust_versions.inc b/meta/conf/distro/include/rust_versions.inc
> deleted file mode 100644
> index a11ba22a8f..0000000000
> --- a/meta/conf/distro/include/rust_versions.inc
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -# include this in your distribution to easily switch between versions
> -# just by changing RUST_VERSION variable
> -
> -RUST_VERSION ?= "1.51.0"
> -
> -PREFERRED_VERSION_cargo ?= "${RUST_VERSION}"
> -PREFERRED_VERSION_cargo-native ?= "${RUST_VERSION}"
> -PREFERRED_VERSION_libstd-rs ?= "${RUST_VERSION}"
> -PREFERRED_VERSION_rust ?= "${RUST_VERSION}"
> -PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUST_VERSION}"
> -PREFERRED_VERSION_rust-llvm ?= "${RUST_VERSION}"
> -PREFERRED_VERSION_rust-llvm-native ?= "${RUST_VERSION}"
> -PREFERRED_VERSION_rust-native ?= "${RUST_VERSION}"
>
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [v2] tcmode-default: add rust to the default toolchains
2021-09-03 16:31 ` [OE-core] " Khem Raj
@ 2021-09-06 1:26 ` Randy MacLeod
0 siblings, 0 replies; 3+ messages in thread
From: Randy MacLeod @ 2021-09-06 1:26 UTC (permalink / raw)
To: openembedded-core; +Cc: raj.khem
Remove the rust_versions.inc file and put it's content
in tcmode-default.inc is done for other toolchains.
Rename RUST_VERSION to RUSTVERSION to adhere to the
naming format used for other languages.
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
---
meta/conf/distro/include/rust_versions.inc | 13 -------------
meta/conf/distro/include/tcmode-default.inc | 13 +++++++++++++
2 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 meta/conf/distro/include/rust_versions.inc
diff --git a/meta/conf/distro/include/rust_versions.inc b/meta/conf/distro/include/rust_versions.inc
deleted file mode 100644
index a11ba22a8f..0000000000
--- a/meta/conf/distro/include/rust_versions.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# include this in your distribution to easily switch between versions
-# just by changing RUST_VERSION variable
-
-RUST_VERSION ?= "1.51.0"
-
-PREFERRED_VERSION_cargo ?= "${RUST_VERSION}"
-PREFERRED_VERSION_cargo-native ?= "${RUST_VERSION}"
-PREFERRED_VERSION_libstd-rs ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-llvm ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-llvm-native ?= "${RUST_VERSION}"
-PREFERRED_VERSION_rust-native ?= "${RUST_VERSION}"
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 47f23f5c39..80b03305bb 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -27,6 +27,7 @@ GOVERSION ?= "1.16%"
# This can not use wildcards like 8.0.% since it is also used in mesa to denote
# llvm version being used, so always bump it with llvm recipe version bump
LLVMVERSION ?= "12.0.1"
+RUSTVERSION ?= "1.54.0"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
@@ -81,3 +82,15 @@ PREFERRED_VERSION_nativesdk-go-runtime ?= "${GOVERSION}"
PREFERRED_VERSION_llvm = "${LLVMVERSION}"
PREFERRED_VERSION_llvm-native = "${LLVMVERSION}"
PREFERRED_VERSION_nativesdk-llvm = "${LLVMVERSION}"
+
+# Rust toolchain preferred versions:
+
+PREFERRED_VERSION_cargo ?= "${RUSTVERSION}"
+PREFERRED_VERSION_cargo-native ?= "${RUSTVERSION}"
+PREFERRED_VERSION_libstd-rs ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust-cross-${TARGET_ARCH} ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust-llvm ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust-llvm-native ?= "${RUSTVERSION}"
+PREFERRED_VERSION_rust-native ?= "${RUSTVERSION}"
+
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-06 1:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-03 16:20 [PATCH] rust: remove rust_versions.inc since there can be only one Randy MacLeod
2021-09-03 16:31 ` [OE-core] " Khem Raj
2021-09-06 1:26 ` [v2] tcmode-default: add rust to the default toolchains Randy MacLeod
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.