summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-05-21 14:50:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-05-28 15:09:01 +0100
commit3f69d525d813ee071bd20c7577a0653cb0f0a210 (patch)
treeb866bfc6b1d5bd079e10056cb04c7708ebb9258e
parenta7bf118441d81d47a8a2eb53a73b265d84c80d92 (diff)
downloadpoky-3f69d525d813ee071bd20c7577a0653cb0f0a210.tar.gz
rust: build the default set of tools
Setting it explicitly replaces rust's default choice which is rustdoc (needed for example in selftests and otherwise expected to be present in typical rust installations): https://github.com/rust-lang/rust/blob/master/config.example.toml#L320 This addresses some of the rust selftest failures but not all. Help is appreciate to restore the selftest. Unfortunately, this also breaks rust reproducibility (or rather exposes that it was never properly fixed, as explained here: https://lists.openembedded.org/g/openembedded-core/message/199288 ) (From OE-Core rev: 58eaf2ee6c0809bf0a0d3c1d177e62bda7241651) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py2
-rw-r--r--meta/recipes-devtools/rust/rust_1.75.0.bb1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index 80e830136f..97a9c3da90 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -16,6 +16,8 @@ import os
16import datetime 16import datetime
17 17
18exclude_packages = [ 18exclude_packages = [
19 'rust-rustdoc',
20 'rust-dbg'
19 ] 21 ]
20 22
21def is_excluded(package): 23def is_excluded(package):
diff --git a/meta/recipes-devtools/rust/rust_1.75.0.bb b/meta/recipes-devtools/rust/rust_1.75.0.bb
index d5bc057a45..c66c14cc5a 100644
--- a/meta/recipes-devtools/rust/rust_1.75.0.bb
+++ b/meta/recipes-devtools/rust/rust_1.75.0.bb
@@ -149,7 +149,6 @@ python do_configure() {
149 config.add_section("build") 149 config.add_section("build")
150 config.set("build", "submodules", e(False)) 150 config.set("build", "submodules", e(False))
151 config.set("build", "docs", e(False)) 151 config.set("build", "docs", e(False))
152 config.set("build", "tools", ["rust-demangler",])
153 152
154 rustc = d.getVar('RUSTC_BOOTSTRAP') 153 rustc = d.getVar('RUSTC_BOOTSTRAP')
155 config.set("build", "rustc", e(rustc)) 154 config.set("build", "rustc", e(rustc))