Skip to contentSkip to conversation

rust: Update "do_update_snapshot" task for rust-snapshot.inc

PATCH Superseded [email protected] 7 participants 16 messages Mar 28, 2025 – Mar 31, 2025

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 rust: Update "do_update_snapshot" task for rust-snapshot.inc

From: Yash Shinde <[email protected]>

The 'do_update_snapshot' task is failed with below error:
Exception: FileNotFoundError: [Errno 2] No such file or directory: '.../rustc-1.83.0-src/src/stage0.json'

There are changes in use of key-value format in stage0 file in rust sources and the rust recipe should be apdated for that.

Changes in rust:
https://github.com/rust-lang/rust/commit/1adfffd07f8704ca722f3897719ace079944b0c5

---
 meta/recipes-devtools/rust/rust_1.84.1.bb | 47 +++++++++++++++--------
 1 file changed, 30 insertions(+), 17 deletions(-)
meta/recipes-devtools/rust/rust_1.84.1.bb +30 -17
index ee8c782ce3..5a181b059c 100644
@@ -327,24 +327,37 @@ python do_update_snapshot() {
 
     from collections import defaultdict
 
-    with open(os.path.join(d.getVar("S"), "src", "stage0.json")) as f:
-        j = json.load(f)
-
-    config_dist_server = j['config']['dist_server']
-    compiler_date = j['compiler']['date']
-    compiler_version = j['compiler']['version']
+    key_value_pairs = {}
+    with open(os.path.join(d.getVar("S"), "src", "stage0")) as f:
+        for line in f:
+            # Skip empty lines or comments
+            if not line.strip() or line.startswith("#"):
+                continue
+            # Split the line into key and value using '=' as separator
+            match = re.match(r'(\S+)\s*=\s*(\S+)', line.strip())
+            if match:
+                key = match.group(1)
+                value = match.group(2)
+                key_value_pairs[key] = value
+    # Extract the required values from key_value_pairs
+    config_dist_server = key_value_pairs.get('dist_server', '')
+    compiler_date = key_value_pairs.get('compiler_date', '')
+    compiler_version = key_value_pairs.get('compiler_version', '')
 
     src_uri = defaultdict(list)
-    for k, v in j['checksums_sha256'].items():
-        m = re.search(f"dist/{compiler_date}/(?P<component>.*)-{compiler_version}-(?P<arch>.*)-unknown-linux-gnu\\.tar\\.xz", k)
-        if m:
-            component = m.group('component')
-            arch = m.group('arch')
-            src_uri[arch].append(f"SRC_URI[{component}-snapshot-{arch}.sha256sum] = \"{v}\"")
-
+    # Assuming checksums_sha256 is now a key-value pair like: checksum_key = checksum_value
+    for k, v in key_value_pairs.items():
+        # Match the pattern for checksums
+        if "dist" in k and "tar.xz" in k:
+            m = re.search(f"dist/{compiler_date}/(?P<component>.*)-{compiler_version}-(?P<arch>.*)-unknown-linux-gnu\\.tar\\.xz", k)
+            if m:
+                component = m.group('component')
+                arch = m.group('arch')
+                src_uri[arch].append(f"SRC_URI[{component}-snapshot-{arch}.sha256sum] = \"{v}\"")
+    # Create the snapshot string with the extracted values
     snapshot = """\
 ## This is information on the rust-snapshot (binary) used to build our current release.
-## snapshot info is taken from rust/src/stage0.json
+## snapshot info is taken from rust/src/stage0
 ## Rust is self-hosting and bootstraps itself with a pre-built previous version of itself.
 ## The exact (previous) version that has been used is specified in the source tarball.
 ## The version is replicated here.
@@ -352,10 +365,10 @@ python do_update_snapshot() {
 SNAPSHOT_VERSION = "%s"
 
 """ % compiler_version
-
+    # Add the checksum components to the snapshot
     for arch, components in src_uri.items():
         snapshot += "\n".join(components) + "\n\n"
-
+    # Add the additional snapshot URIs
     snapshot += """\
 SRC_URI += " \\
     ${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \\
@@ -369,7 +382,7 @@ RUST_STD_SNAPSHOT = "rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-lin
 RUSTC_SNAPSHOT = "rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
 CARGO_SNAPSHOT = "cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
 """ % config_dist_server
-
+    # Write the updated snapshot information to the rust-snapshot.inc file
     with open(os.path.join(d.getVar("THISDIR"), "rust-snapshot.inc"), "w") as f:
         f.write(snapshot)
 }
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/3 rust: Upgrade 1.84.1->1.85.0

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Some of the major updates:

- Update LIC_FILES_CHKSUM in libstd-rs and rust recipes.

- Pass '-Zforce-unstable-if-unmarked' to RUSTFLAGS in libstd-rs.bb
Fix: https://github.com/rust-lang/rust/issues/133857#issuecomment-2526341227

- Downgrade bootstrap cc version causing bootstrap to fail on custom targets. (Backported from v1.85.1)
Fix: https://github.com/rust-lang/rust/pull/137460/commits/e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7

- Explicitly set float ABI for all ARM 32 bits targets.
Fix: https://github.com/rust-lang/rust/commit/a51fefcaab835b310e2e26005b50982d0049d905

- Rust v1.85.0 tarball doesn't ship gcc tree. Drop the unpack:append() which removed it and prevented the bloat.
Fix: https://github.com/rust-lang/rust/commit/13c3f9b9498013837782b46120085ea19ca75518

Adapted the patch changes with v1.85.0:
repro-issue-fix-with-cc-crate-hashmap.patch revert-link-std-statically-in-rustc_driver-feature.patch rust-oe-selftest.patch rv32-cargo-rustix-0.38.40-fix.patch

Dropped patches:
fix-tidy-check-failure.patch since it's merged with v1.85.0.

---
 .../classes-recipe/rust-target-config.bbclass |   4 +
 meta/conf/distro/include/tcmode-default.inc   |   2 +-
 .../rust/{cargo_1.84.1.bb => cargo_1.85.0.bb} |   0
 .../rust/files/downgrade-bootstrap-cc.patch   |  41 +++
 .../rust/files/fix-tidy-check-failure.patch   |  19 --
 ...epro-issue-fix-with-cc-crate-hashmap.patch |  60 ++++-
 ...d-statically-in-rustc_driver-feature.patch |   4 +-
 .../rust/files/rust-oe-selftest.patch         |  46 ++--
 .../files/rv32-cargo-rustix-0.38.38-fix.patch | 236 ------------------
 .../files/rv32-cargo-rustix-0.38.40-fix.patch | 236 ++++++++++++++++++
 ...ibstd-rs_1.84.1.bb => libstd-rs_1.85.0.bb} |   4 +-
 ....84.1.bb => rust-cross-canadian_1.85.0.bb} |   0
 ...ust-llvm_1.84.1.bb => rust-llvm_1.85.0.bb} |   0
 meta/recipes-devtools/rust/rust-snapshot.inc  |  81 +++---
 meta/recipes-devtools/rust/rust-source.inc    |  23 +-
 .../rust/{rust_1.84.1.bb => rust_1.85.0.bb}   |   0
 16 files changed, 415 insertions(+), 341 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.84.1.bb => cargo_1.85.0.bb} (100%)
 create mode 100644 meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch
 delete mode 100644 meta/recipes-devtools/rust/files/fix-tidy-check-failure.patch
 delete mode 100644 meta/recipes-devtools/rust/files/rv32-cargo-rustix-0.38.38-fix.patch
 create mode 100644 meta/recipes-devtools/rust/files/rv32-cargo-rustix-0.38.40-fix.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.84.1.bb => libstd-rs_1.85.0.bb} (88%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.84.1.bb => rust-cross-canadian_1.85.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.84.1.bb => rust-llvm_1.85.0.bb} (100%)
 rename meta/recipes-devtools/rust/{rust_1.84.1.bb => rust_1.85.0.bb} (100%)
meta/classes-recipe/rust-target-config.bbclass +4 -0
index 67aaa56bac..cb4655ec50 100644
@@ -144,6 +144,8 @@ TARGET_POINTER_WIDTH[armv7-eabi] = "32"
 TARGET_C_INT_WIDTH[armv7-eabi] = "32"
 MAX_ATOMIC_WIDTH[armv7-eabi] = "64"
 FEATURES[armv7-eabi] = "+v7,+vfp2,+thumb2"
+ABI[armv7-eabi] = "eabihf"
+LLVM_FLOATABI[armv7-eabi] = "hard"
 
 ## aarch64-unknown-linux-{gnu, musl}
 DATA_LAYOUT[aarch64] = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32"
@@ -371,6 +373,8 @@ def rust_gen_target(d, thing, wd, arch):
     tspec['target-c-int-width'] = d.getVarFlag('TARGET_C_INT_WIDTH', arch_abi)
     tspec['target-endian'] = d.getVarFlag('TARGET_ENDIAN', arch_abi)
     tspec['arch'] = arch_to_rust_target_arch(rust_arch)
+    tspec['llvm-floatabi'] = d.getVarFlag('LLVM_FLOATABI', arch_abi)
+    tspec['abi'] = d.getVarFlag('ABI', arch_abi)
     if "baremetal" in d.getVar('TCLIBC'):
         tspec['os'] = "none"
     else:
meta/conf/distro/include/tcmode-default.inc +1 -1
index ddfba7256a..6d6c146284 100644
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 GCCVERSION ?= "14.%"
 SDKGCCVERSION ?= "${GCCVERSION}"
 GLIBCVERSION ?= "2.41%"
-RUSTVERSION ?= "1.84.1%"
+RUSTVERSION ?= "1.85.0%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
meta/recipes-devtools/rust/cargo_1.85.0.bb renamed from meta/recipes-devtools/rust/cargo_1.84.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.84.1.bb
rename to meta/recipes-devtools/rust/cargo_1.85.0.bb
meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch new file +41 -0

41 lines not on this page · raw message

meta/recipes-devtools/rust/files/fix-tidy-check-failure.patch deleted +0 -19
deleted file mode 100644
index 54b4ee690b..0000000000
@@ -1,19 +0,0 @@
-fix a comment with uneven number of backticks in rustc_mir_build
-
-Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/8e7734978245522cbbd14e53e08e888faf031ded]
-
-Signed-off-by: Deepesh Varatharajan <[email protected]>
----
-diff --git a/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs b/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs
-index 3f89e33778..c66af11845 100644
---- a/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs
-+++ b/compiler/rustc_mir_build/src/build/expr/as_rvalue.rs
-@@ -231,7 +231,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
-                             if range.start <= range.end { BinOp::BitAnd } else { BinOp::BitOr };
-
-                         let mut comparer = |range: u128, bin_op: BinOp| -> Place<'tcx> {
--                            // We can use `ty::TypingEnv::fully_monomorphized()`` here
-+                            // We can use `ty::TypingEnv::fully_monomorphized()` here
-                             // as we only need it to compute the layout of a primitive.
-                             let range_val = Const::from_bits(
-                                 this.tcx,
meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch +58 -2

77 lines not on this page · raw message

meta/recipes-devtools/rust/files/revert-link-std-statically-in-rustc_driver-feature.patch +2 -2
index 0ba0921f59..20a49d46dc 100644
@@ -40,9 +40,9 @@ index 39fa23766b..51d86b4009 100644
 
 -use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 +use rustc_data_structures::fx::FxHashMap;
- use rustc_hir::def_id::CrateNum;
+ use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
+ use rustc_index::IndexVec;
  use rustc_middle::bug;
- use rustc_middle::middle::dependency_format::{Dependencies, DependencyList, Linkage};
 @@ -161,44 +161,19 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList {
          }
          Linkage::Dynamic | Linkage::IncludedFromDylib => {}
meta/recipes-devtools/rust/files/rust-oe-selftest.patch +23 -23

102 lines not on this page · raw message

meta/recipes-devtools/rust/files/rv32-cargo-rustix-0.38.38-fix.patch deleted +0 -236

236 lines not on this page · raw message

meta/recipes-devtools/rust/files/rv32-cargo-rustix-0.38.40-fix.patch new file +236 -0

236 lines not on this page · raw message

meta/recipes-devtools/rust/libstd-rs_1.85.0.bb renamed from meta/recipes-devtools/rust/libstd-rs_1.84.1.bb +3 -1
similarity index 88%
rename from meta/recipes-devtools/rust/libstd-rs_1.84.1.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.85.0.bb
index 06a2889b92..1994368812 100644
@@ -2,7 +2,7 @@ SUMMARY = "Rust standard libaries"
 HOMEPAGE = "http://www.rust-lang.org"
 SECTION = "devel"
 LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
-LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
+LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=9c0fae516fe8aaea2fb601db4800daf7"
 
 require rust-source.inc
 
@@ -24,6 +24,8 @@ DEPENDS:remove:riscv64 = "libunwind"
 
 # Embed bitcode in order to allow compiling both with and without LTO
 RUSTFLAGS += "-Cembed-bitcode=yes"
+# Ensure that user code can't access the dependencies of the standard library
+RUSTFLAGS += "-Zforce-unstable-if-unmarked"
 # Needed so cargo can find libbacktrace
 RUSTFLAGS += "-L ${STAGING_LIBDIR} -C link-arg=-Wl,-soname,libstd.so"
 
meta/recipes-devtools/rust/rust-cross-canadian_1.85.0.bb renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.84.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.84.1.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.85.0.bb
meta/recipes-devtools/rust/rust-llvm_1.85.0.bb renamed from meta/recipes-devtools/rust/rust-llvm_1.84.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.84.1.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.85.0.bb
meta/recipes-devtools/rust/rust-snapshot.inc +41 -40

106 lines not on this page · raw message

meta/recipes-devtools/rust/rust-source.inc +6 -17
index 92bb5e4779..e07055882c 100644
@@ -1,30 +1,19 @@
 RUST_VERSION ?= "${@d.getVar('PV').split('-')[0]}"
 
 SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust \
-            file://rv32-cargo-rustix-0.38.38-fix.patch;patchdir=${RUSTSRC} \
+            file://rv32-cargo-rustix-0.38.40-fix.patch;patchdir=${RUSTSRC} \
             file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \
-	    file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \
+            file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \
             file://oeqa-selftest-Increase-timeout-in-process-sigpipe-ru.patch;patchdir=${RUSTSRC} \
             file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \
-	    file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \
-	    file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \
-	    file://fix-tidy-check-failure.patch;patchdir=${RUSTSRC} \
+            file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \
+            file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \
+            file://downgrade-bootstrap-cc.patch;patchdir=${RUSTSRC} \
 "
-SRC_URI[rust.sha256sum] = "e23ec747a06ffd3e94155046f40b6664ac152c9ee3c2adfd90353a7ccff24226"
+SRC_URI[rust.sha256sum] = "d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
-#After updating to Rust 1.85 we can revert this removal of "src/gcc"
-remove_gcc_directory() {
-    # Ensure the gcc directory exists
-    gcc_dir="${S}/src/gcc"
-    if [ -d "$gcc_dir" ]; then
-        rm -rf "$gcc_dir"
-    fi
-}
-# Add postfunc to the do_unpack task
-do_unpack[postfuncs] += "remove_gcc_directory"
-
 UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html"
 UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src"
 
meta/recipes-devtools/rust/rust_1.85.0.bb renamed from meta/recipes-devtools/rust/rust_1.84.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.84.1.bb
rename to meta/recipes-devtools/rust/rust_1.85.0.bb
Signature · 1 line
2.43.0
#2 lore raw

Re: [OE-core] [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

Quoted 8 lines · Yash Shinde via lists.openembedded.org

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Some of the major updates:

- Update LIC_FILES_CHKSUM in libstd-rs and rust recipes.

How did the license file change? Was the overall recipe LICENSE affected?

You need to be clear about what changed and if LICENSE is impacted.

Cheers,

Richard

#3 lore raw

Re: [OE-core] [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

Quoted 8 lines · Richard Purdie via lists.openembedded.org
Quoted 5 lines · Yash Shinde via lists.openembedded.org

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Quoted 8 lines
Quoted 3 lines

Some of the major updates:

- Update LIC_FILES_CHKSUM in libstd-rs and rust recipes.

How did the license file change? Was the overall recipe LICENSE affected?

You need to be clear about what changed and if LICENSE is impacted.

Also the checksum update for libstd-rs is done in this commit, but for rust it's done in 1.85.0->1.85.1 commit, which is incorrect.

The history of changes is here:
https://github.com/rust-lang/rust/commits/master/COPYRIGHT

The latest change isn't in 1.85, but the unicode sync is - please confirm by comparing what's in the 1.84 vs 1.85 tarballs.

Use

License-Update: <describe what changed>

in the commit message.

Alex

#4 lore raw

Re: [OE-core] [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

Quoted 26 lines · Alexander Kanavin

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 7 lines · Richard Purdie via lists.openembedded.org
Quoted 5 lines · Yash Shinde via lists.openembedded.org

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Quoted 7 lines
Quoted 3 lines

Some of the major updates:

- Update LIC_FILES_CHKSUM in libstd-rs and rust recipes.

How did the license file change? Was the overall recipe LICENSE affected?

You need to be clear about what changed and if LICENSE is impacted.

Also the checksum update for libstd-rs is done in this commit, but for rust it's done in 1.85.0->1.85.1 commit, which is incorrect.

The history of changes is here:
https://github.com/rust-lang/rust/commits/master/COPYRIGHT

Quoted 8 lines

The latest change isn't in 1.85, but the unicode sync is - please confirm by comparing what's in the 1.84 vs 1.85 tarballs.

Use

License-Update: <describe what changed>

in the commit message.

There was an update in Unicode license from "Unicode-DFS-2016" to "Unicode-3.0".
https://github.com/rust-lang/rust/commit/6d2a3e9786ec43a0e0af20386e7046328296ac86

I will update both the checksums in the commit for 1.85.0 update in v2.

Regards,
Yash

Quoted 2 lines

Alex

#5 lore raw

Patchtest results for [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

In reply to [email protected]

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/2-3-rust-Upgrade-1.84.1--1.85.0.patch

FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test CVE tag format (test_patch.TestPatch.test_cve_tag_format)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test Signed-off-by presence (test_patch.TestPatch.test_signed_off_by_presence)
PASS: test Upstream-Status presence (test_patch.TestPatch.test_upstream_status_presence_format)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#6 lore raw

Re: [OE-core] [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

In reply to [email protected]
Quoted 9 lines

Op 28 mrt 2025, om 15:30 heeft Yash Shinde via lists.openembedded.org <[email protected]> het volgende geschreven:

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Quoted 6 lines

Some of the major updates:

[...]

- Explicitly set float ABI for all ARM 32 bits targets.
Fix: https://github.com/rust-lang/rust/commit/a51fefcaab835b310e2e26005b50982d0049d905

In OE we allow selecting the ABI using tunefiles, so this hardcoding to hf will do the wrong thing for non-hf builds (which are rare, but still).

regards,

Koen

#7 lore raw

Re: [OE-core] [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

Quoted 9 lines · Koen Kooi via lists.openembedded.org
Quoted 9 lines

Op 28 mrt 2025, om 15:30 heeft Yash Shinde via lists.openembedded.org <[email protected]> het volgende geschreven:

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Quoted 8 lines
Quoted 6 lines

Some of the major updates:

[...]

- Explicitly set float ABI for all ARM 32 bits targets.
Fix: https://github.com/rust-lang/rust/commit/a51fefcaab835b310e2e26005b50982d0049d905

In OE we allow selecting the ABI using tunefiles, so this hardcoding to hf will do the wrong thing for non-hf builds (which are rare, but still).

Well spotted! The patches did fail in CI on qemuarmv5:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/80/builds/1207

so at least we actually caught it in testing too.

Cheers,

Richard

#8 lore raw

Re: [OE-core] [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

Quoted 15 lines · Richard Purdie

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 11 lines · Koen Kooi via lists.openembedded.org
Quoted 11 lines

Op 28 mrt 2025, om 15:30 heeft Yash Shinde via lists.openembedded.org <[email protected]> het volgende geschreven:

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Some of the major updates:
[...]

Quoted 8 lines
Quoted 3 lines
Quoted 2 lines

- Explicitly set float ABI for all ARM 32 bits targets.
Fix: https://github.com/rust-lang/rust/commit/a51fefcaab835b310e2e26005b50982d0049d905

In OE we allow selecting the ABI using tunefiles, so this hardcoding to hf will do the wrong thing for non-hf builds (which are rare, but still).

Well spotted! The patches did fail in CI on qemuarmv5:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/80/builds/1207

so at least we actually caught it in testing too.

Thanks for the insights on selection of ABIs in OE.

I have updated llvm-float ABI for rust target config based on "TARGET_FPU" set in OE which should work. I will send a v2 with that.

Regards,
Yash.

Quoted 4 lines

Cheers,

Richard

#9 lore raw

Re: [OE-core] [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

In reply to Koen Kooi
Quoted 10 lines · Koen Kooi via lists.openembedded.org
Quoted 10 lines

Op 28 mrt 2025, om 15:30 heeft Yash Shinde via lists.openembedded.org <[email protected]> het volgende geschreven:

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Quoted 9 lines
Quoted 6 lines

Some of the major updates:

[...]

- Explicitly set float ABI for all ARM 32 bits targets.
Fix: https://github.com/rust-lang/rust/commit/a51fefcaab835b310e2e26005b50982d0049d905

In OE we allow selecting the ABI using tunefiles, so this hardcoding to hf will do the wrong thing for non-hf builds (which are rare, but still).

this commit has LLVM_FLOATABI introduced, which is what we can set based on tunes.

Quoted 13 lines

regards,

Koen

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#213851): https://lists.openembedded.org/g/openembedded-core/message/213851
Mute This Topic: https://lists.openembedded.org/mt/111955030/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#10 lore raw

Re: [OE-core] [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

Quoted 17 lines · Khem Raj

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 12 lines · Koen Kooi via lists.openembedded.org
Quoted 12 lines

Op 28 mrt 2025, om 15:30 heeft Yash Shinde via lists.openembedded.org <[email protected]> het volgende geschreven:

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Some of the major updates:
[...]

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

- Explicitly set float ABI for all ARM 32 bits targets.
Fix: https://github.com/rust-lang/rust/commit/a51fefcaab835b310e2e26005b50982d0049d905

In OE we allow selecting the ABI using tunefiles, so this hardcoding to hf will do the wrong thing for non-hf builds (which are rare, but still).

this commit has LLVM_FLOATABI introduced, which is what we can set based on tunes.

Thanks for the pointers.
I will update llvm-float ABI for rust target config based on "TARGET_FPU" set in OE.

Regards,
Yash.

Quoted 4 lines
Quoted 4 lines

regards,

Koen

#11 lore raw

Re: [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

In reply to [email protected]
Quoted 49 lines · On 2025-03-28 10:30 a.m., [email protected] wrote:

From: Yash Shinde<[email protected]>

Rust stable version updated to 1.85.0
https://blog.rust-lang.org/2025/02/20/Rust-1.85.0.html

Some of the major updates:

- Update LIC_FILES_CHKSUM in libstd-rs and rust recipes.

- Pass '-Zforce-unstable-if-unmarked' to RUSTFLAGS in libstd-rs.bb Fix:https://github.com/rust-lang/rust/issues/133857#issuecomment-2526341227

- Downgrade bootstrap cc version causing bootstrap to fail on custom targets. (Backported from v1.85.1) Fix:https://github.com/rust-lang/rust/pull/137460/commits/e4ca11f87ffca8c63aa56d45b46e62b6acc58bd7

- Explicitly set float ABI for all ARM 32 bits targets. Fix:https://github.com/rust-lang/rust/commit/a51fefcaab835b310e2e26005b50982d0049d905

- Rust v1.85.0 tarball doesn't ship gcc tree. Drop the unpack:append() which removed it and prevented the bloat. Fix:https://github.com/rust-lang/rust/commit/13c3f9b9498013837782b46120085ea19ca75518

Adapted the patch changes with v1.85.0:

   repro-issue-fix-with-cc-crate-hashmap.patch
   revert-link-std-statically-in-rustc_driver-feature.patch
   rust-oe-selftest.patch
   rv32-cargo-rustix-0.38.40-fix.patch

Dropped patches:
fix-tidy-check-failure.patch since it's merged with v1.85.0.

---
  .../classes-recipe/rust-target-config.bbclass |   4 +
  meta/conf/distro/include/tcmode-default.inc   |   2 +-
  .../rust/{cargo_1.84.1.bb => cargo_1.85.0.bb} |   0
  .../rust/files/downgrade-bootstrap-cc.patch   |  41 +++
  .../rust/files/fix-tidy-check-failure.patch   |  19 --
  ...epro-issue-fix-with-cc-crate-hashmap.patch |  60 ++++-
  ...d-statically-in-rustc_driver-feature.patch |   4 +-
  .../rust/files/rust-oe-selftest.patch         |  46 ++--
  .../files/rv32-cargo-rustix-0.38.38-fix.patch | 236 ------------------
  .../files/rv32-cargo-rustix-0.38.40-fix.patch | 236 ++++++++++++++++++
  ...ibstd-rs_1.84.1.bb => libstd-rs_1.85.0.bb} |   4 +-
  ....84.1.bb => rust-cross-canadian_1.85.0.bb} |   0
  ...ust-llvm_1.84.1.bb => rust-llvm_1.85.0.bb} |   0
  meta/recipes-devtools/rust/rust-snapshot.inc  |  81 +++---
  meta/recipes-devtools/rust/rust-source.inc    |  23 +-
  .../rust/{rust_1.84.1.bb => rust_1.85.0.bb}   |   0
  16 files changed, 415 insertions(+), 341 deletions(-)
Quoted 10 lines

rename meta/recipes-devtools/rust/{cargo_1.84.1.bb => cargo_1.85.0.bb} (100%)
create mode 100644 meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch
delete mode 100644 meta/recipes-devtools/rust/files/fix-tidy-check-failure.patch
delete mode 100644 meta/recipes-devtools/rust/files/rv32-cargo-rustix-0.38.38-fix.patch create mode 100644 meta/recipes-devtools/rust/files/rv32-cargo-rustix-0.38.40-fix.patch rename meta/recipes-devtools/rust/{libstd-rs_1.84.1.bb => libstd-rs_1.85.0.bb} (88%) rename meta/recipes-devtools/rust/{rust-cross-canadian_1.84.1.bb => rust-cross-canadian_1.85.0.bb} (100%) rename meta/recipes-devtools/rust/{rust-llvm_1.84.1.bb => rust-llvm_1.85.0.bb} (100%) rename meta/recipes-devtools/rust/{rust_1.84.1.bb => rust_1.85.0.bb} (100%)

Others have pointed out a few problems, including a build failure.

...

Quoted 23 lines

RUST_DIST_SERVER ="https://static.rust-lang.org"

meta/recipes-devtools/rust/rust-snapshot.inc +1 -0
+
  RUST_STD_SNAPSHOT = "rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
  RUSTC_SNAPSHOT = "rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
  CARGO_SNAPSHOT = "cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
meta/recipes-devtools/rust/rust-source.inc +2 -3
index 92bb5e4779..e07055882c 100644
@@ -1,30 +1,19 @@
  RUST_VERSION ?="${@d.getVar('PV').split('-')[0]}"
 
  SRC_URI +="https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;name=rust 
 \ - file://rv32-cargo-rustix-0.38.38-fix.patch;patchdir=${RUSTSRC} \ + file://rv32-cargo-rustix-0.38.40-fix.patch;patchdir=${RUSTSRC} \ file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \ - file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \ + file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \ file://oeqa-selftest-Increase-timeout-in-process-sigpipe-ru.patch;patchdir=${RUSTSRC} \ file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \ - file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \ - file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \ 
- file://fix-tidy-check-failure.patch;patchdir=${RUSTSRC} \ + 
 file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \ + file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \ 
+ file://downgrade-bootstrap-cc.patch;patchdir=${RUSTSRC} \ "
-SRC_URI[rust.sha256sum] = "e23ec747a06ffd3e94155046f40b6664ac152c9ee3c2adfd90353a7ccff24226"
+SRC_URI[rust.sha256sum] = "d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7"
 
  RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
-#After updating to Rust 1.85 we can revert this removal of "src/gcc"

meta/recipes-devtools/rust/rust-source.inc line 21

Quoted 10 lines
meta/recipes-devtools/rust/rust-source.inc +0 -10
-remove_gcc_directory() {
-    # Ensure the gcc directory exists
-    gcc_dir="${S}/src/gcc"
-    if [ -d "$gcc_dir" ]; then
-        rm -rf "$gcc_dir"
-    fi
-}
-# Add postfunc to the do_unpack task
-do_unpack[postfuncs] += "remove_gcc_directory"
-

On IRC, Richard said:
    I'm puzzled as the rust space fix didn't have the impact on the metrics I'd hoped for :/ I think there is something else going on. ...

Let's review.

Rust-1.83, is where the src/gcc bloat was added.
That was merged here:

   commit 72e21bef1a6bcc8f05ad4e24cfef4228384f1c3a
   Author:     Deepesh Varatharajan <[email protected]>
   AuthorDate: Wed Mar 5 01:01:56 2025
   Commit:     Richard Purdie <[email protected]>
   CommitDate: Wed Mar 5 16:26:54 2025

       rust: Upgrade 1.82.0->1.83.0

The postfunc removal commit was here:

   commit 2cb5d1accca23df67dd55d01416ea404ab92683b
   Author:     Deepesh Varatharajan <[email protected]>
   AuthorDate: Thu Mar 27 05:06:03 2025
   Commit:     Richard Purdie <[email protected]>
   CommitDate: Thu Mar 27 09:41:58 2025

       rust: Fix bloat issue in recent rust updates

so we should see a large tmpfs usage increase on March 5th and a significant reduction on March 27th.

Look at the buildperf-alma8  (or buildperf-debian11) on March 27th:

https://valkyrie.yocto.io/pub/non-release/?type=buildperf-alma8&date=2025-03-27

There are 4 perf builds that day and build number: 20250327-93 includes the bloat removal commit

which I found by opening each run, starting with the lowest run numbers and clicking on the "commit" in the "Current commit" column at the top of each page.

You can see that the FS usage did decrease but only by 785 MB. Maybe that's the 1 GB for src/gcc and some other packages are adding 215 MB.

If you look at the FS usage for
   test1: Build core-image-sato

You can see the significant increase on March 5th of 103504 - 97857 = 5647 MB that Richard pointed out week(s) ago:

There's another significant increase on March 7, and a decrease on March 11/12 which would be good to understand.

So, it's Friday afternoon and I'm not going to dig any more today.

Yash, Deepesh,

You did mentioned that you dropped  the rm -rf src/gcc in the commit log but
in addition please do some work to check what the FS usage is for a core-image-minimal build at each stage probably initially bug checking out 1.82, 1.83, 1.84, local commit 1.85. in poky's git repo.

Are you able to reproduce the initial ~5647 MB increase in 1.83 ? What tmpdir size do you see once the:
   rust: Fix bloat issue in recent rust updates
commit is added?

If things are confusing using the public poky repo and master branch commits you could start with poky with rust-1.82 and create a branch where you just add the rust updates (and dependent commits as needed) to eliminate changes from other parts of the system.

Please send an summary of findings email to this list each day as you are testing and reviewing the data.

Thanks,

../Randy

Quoted 7 lines
meta/recipes-devtools/rust/rust-source.inc +0 -0
  UPSTREAM_CHECK_URI ="https://forge.rust-lang.org/infra/other-installation-methods.html"
  UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src"
 
meta/recipes-devtools/rust/rust_1.85.0.bb renamed from meta/recipes-devtools/rust/rust_1.84.1.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust_1.84.1.bb
rename to meta/recipes-devtools/rust/rust_1.85.0.bb
Signature · 2 lines
# Randy MacLeod
# Wind River Linux
#12 lore raw

Re: [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

Quoted 27 lines · Randy MacLeod
Quoted 17 lines · On 2025-03-28 10:30 a.m., [email protected] wrote:

 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"

meta/recipes-devtools/rust/rust-source.inc +0 -11
-#After updating to Rust 1.85 we can revert this removal of "src/gcc"
-remove_gcc_directory() {
-    # Ensure the gcc directory exists
-    gcc_dir="${S}/src/gcc"
-    if [ -d "$gcc_dir" ]; then
-        rm -rf "$gcc_dir"
-    fi
-}
-# Add postfunc to the do_unpack task
-do_unpack[postfuncs] += "remove_gcc_directory"
-
Quoted 4 lines

Quoted 8 lines

 On IRC, Richard said:
     I'm puzzled as the rust space fix didn't have the impact on the metrics I'd hoped for :/ I think there is something else going on. ...

I a look and realised the issue, the trouble is S is not always RUSTSRC. I've sent a patch, hopefully the metrics look better this time.

Cheers,

Richard

#13 lore raw

Re: [PATCH 2/3] rust: Upgrade 1.84.1->1.85.0

Quoted 37 lines · Richard Purdie

CAUTION: This email comes from a non Wind River email account!
Do not click links or open attachments unless you recognize the sender and know the content is safe.

Quoted 20 lines · Randy MacLeod
Quoted 19 lines · On 2025-03-28 10:30 a.m., [email protected] wrote:
  RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
meta/recipes-devtools/rust/rust-source.inc +0 -11
-#After updating to Rust 1.85 we can revert this removal of "src/gcc"
-remove_gcc_directory() {
-    # Ensure the gcc directory exists
-    gcc_dir="${S}/src/gcc"
-    if [ -d "$gcc_dir" ]; then
-        rm -rf "$gcc_dir"
-    fi
-}
-# Add postfunc to the do_unpack task
-do_unpack[postfuncs] += "remove_gcc_directory"
-
Quoted 13 lines
Quoted 1 line

On IRC, Richard said:
I'm puzzled as the rust space fix didn't have the impact on the metrics I'd hoped for :/ I think there is something else going on. ...

Quoted 3 lines

I a look and realised the issue, the trouble is S is not always RUSTSRC. I've sent a patch, hopefully the metrics look better this time.

Thank you for looking into it and identifying the issue. This should certainly work.
Looking forward for the results.

Regards,
Yash

Quoted 3 lines

Cheers,

Richard

#14 lore raw

PATCH 3/3 rust: Upgrade 1.85.0->1.85.1

In reply to [email protected]

From: Yash Shinde <[email protected]>

Rust stable version updated to 1.85.1
https://blog.rust-lang.org/2025/03/18/Rust-1.85.1.html

Dropped patches:
downgrade-bootstrap-cc.patch since it's merged with v1.85.1.

---
 meta/conf/distro/include/tcmode-default.inc   |  2 +-
 .../rust/{cargo_1.85.0.bb => cargo_1.85.1.bb} |  0
 .../rust/files/downgrade-bootstrap-cc.patch   | 41 -------------------
 ...ibstd-rs_1.85.0.bb => libstd-rs_1.85.1.bb} |  0
 ....85.0.bb => rust-cross-canadian_1.85.1.bb} |  0
 ...ust-llvm_1.85.0.bb => rust-llvm_1.85.1.bb} |  0
 meta/recipes-devtools/rust/rust-source.inc    |  3 +-
 .../rust/{rust_1.85.0.bb => rust_1.85.1.bb}   |  2 +-
 8 files changed, 3 insertions(+), 45 deletions(-)
 rename meta/recipes-devtools/rust/{cargo_1.85.0.bb => cargo_1.85.1.bb} (100%)
 delete mode 100644 meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch
 rename meta/recipes-devtools/rust/{libstd-rs_1.85.0.bb => libstd-rs_1.85.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-cross-canadian_1.85.0.bb => rust-cross-canadian_1.85.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust-llvm_1.85.0.bb => rust-llvm_1.85.1.bb} (100%)
 rename meta/recipes-devtools/rust/{rust_1.85.0.bb => rust_1.85.1.bb} (99%)
meta/conf/distro/include/tcmode-default.inc +1 -1
index 6d6c146284..a3b3df2afa 100644
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 GCCVERSION ?= "14.%"
 SDKGCCVERSION ?= "${GCCVERSION}"
 GLIBCVERSION ?= "2.41%"
-RUSTVERSION ?= "1.85.0%"
+RUSTVERSION ?= "1.85.1%"
 
 PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
 PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
meta/recipes-devtools/rust/cargo_1.85.1.bb renamed from meta/recipes-devtools/rust/cargo_1.85.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/cargo_1.85.0.bb
rename to meta/recipes-devtools/rust/cargo_1.85.1.bb
meta/recipes-devtools/rust/files/downgrade-bootstrap-cc.patch deleted +0 -41

41 lines not on this page · raw message

meta/recipes-devtools/rust/libstd-rs_1.85.1.bb renamed from meta/recipes-devtools/rust/libstd-rs_1.85.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/libstd-rs_1.85.0.bb
rename to meta/recipes-devtools/rust/libstd-rs_1.85.1.bb
meta/recipes-devtools/rust/rust-cross-canadian_1.85.1.bb renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.85.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-cross-canadian_1.85.0.bb
rename to meta/recipes-devtools/rust/rust-cross-canadian_1.85.1.bb
meta/recipes-devtools/rust/rust-llvm_1.85.1.bb renamed from meta/recipes-devtools/rust/rust-llvm_1.85.0.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/rust/rust-llvm_1.85.0.bb
rename to meta/recipes-devtools/rust/rust-llvm_1.85.1.bb
meta/recipes-devtools/rust/rust-source.inc +1 -2
index e07055882c..8400a4875d 100644
@@ -8,9 +8,8 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
             file://0001-src-core-build_steps-tool.rs-switch-off-lto-for-rust.patch;patchdir=${RUSTSRC} \
             file://revert-link-std-statically-in-rustc_driver-feature.patch;patchdir=${RUSTSRC} \
             file://Zdual-proc-macros-additional-check.patch;patchdir=${RUSTSRC} \
-            file://downgrade-bootstrap-cc.patch;patchdir=${RUSTSRC} \
 "
-SRC_URI[rust.sha256sum] = "d542c397217b5ba5bac7eb274f5ca62d031f61842c3ba4cc5328c709c38ea1e7"
+SRC_URI[rust.sha256sum] = "b1fbf809efe9f036939401e142631c201a53bcf43ec1696bd9f5290ba236a266"
 
 RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
 
meta/recipes-devtools/rust/rust_1.85.1.bb renamed from meta/recipes-devtools/rust/rust_1.85.0.bb +1 -1
similarity index 99%
rename from meta/recipes-devtools/rust/rust_1.85.0.bb
rename to meta/recipes-devtools/rust/rust_1.85.1.bb
index 5a181b059c..20272f612f 100644
@@ -2,7 +2,7 @@ SUMMARY = "Rust compiler and runtime libaries"
 HOMEPAGE = "http://www.rust-lang.org"
 SECTION = "devel"
 LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9c0fae516fe8aaea2fb601db4800daf7"
 
 inherit rust
 inherit cargo_common
Signature · 1 line
2.43.0
#15 lore raw

Patchtest results for [PATCH 3/3] rust: Upgrade 1.85.0->1.85.1

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/3-3-rust-Upgrade-1.85.0--1.85.1.patch

FAIL: test lic files chksum modified not mentioned: LIC_FILES_CHKSUM changed without "License-Update:" tag and description in commit message (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)

PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!