summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2023-01-28 17:39:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-31 17:11:07 +0000
commita10ec437b1387e22a6d09211b4320d5330580f49 (patch)
treedce41f4d113e2f4b531f8e0b88a4cd8d25c18345
parent4360f7e2c16fae6361f3d8dffb0c34ec71c976ad (diff)
downloadpoky-a10ec437b1387e22a6d09211b4320d5330580f49.tar.gz
rust: Upgrade 1.66.1 -> 1.67.0
Disable ZStd to avoid needing libzstd in llvm (mirrors zlib disable). Generate complete list of rust-snapshot artefacts from src/stage0.json. Drop clippy-driver reproducibility change as the code is gone from upstream. Release notes: https://releases.rs/docs/1.67.0/ License-Update: Unicode-TOU text added (already in our license string) (From OE-Core rev: 4900e0c5cb8a092a1d77d4f26249afa59b241da6) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-devtools/rust/cargo_1.67.0.bb (renamed from meta/recipes-devtools/rust/cargo_1.66.1.bb)0
-rw-r--r--meta/recipes-devtools/rust/files/crossbeam_atomic.patch12
-rw-r--r--meta/recipes-devtools/rust/files/hardcodepaths.patch12
-rw-r--r--meta/recipes-devtools/rust/libstd-rs_1.67.0.bb (renamed from meta/recipes-devtools/rust/libstd-rs_1.66.1.bb)2
-rw-r--r--meta/recipes-devtools/rust/rust-cross-canadian_1.67.0.bb (renamed from meta/recipes-devtools/rust/rust-cross-canadian_1.66.1.bb)0
-rw-r--r--meta/recipes-devtools/rust/rust-llvm_1.67.0.bb (renamed from meta/recipes-devtools/rust/rust-llvm_1.66.1.bb)3
-rw-r--r--meta/recipes-devtools/rust/rust-snapshot.inc63
-rw-r--r--meta/recipes-devtools/rust/rust-source.inc2
-rw-r--r--meta/recipes-devtools/rust/rust_1.67.0.bb (renamed from meta/recipes-devtools/rust/rust_1.66.1.bb)2
10 files changed, 59 insertions, 39 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index f628e00d33..7cd0b004e9 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -25,7 +25,7 @@ LINUXLIBCVERSION ?= "6.1%"
25QEMUVERSION ?= "7.2%" 25QEMUVERSION ?= "7.2%"
26GOVERSION ?= "1.19%" 26GOVERSION ?= "1.19%"
27LLVMVERSION ?= "15.%" 27LLVMVERSION ?= "15.%"
28RUSTVERSION ?= "1.66%" 28RUSTVERSION ?= "1.67%"
29 29
30PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 30PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
31PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" 31PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
diff --git a/meta/recipes-devtools/rust/cargo_1.66.1.bb b/meta/recipes-devtools/rust/cargo_1.67.0.bb
index 2b2394e898..2b2394e898 100644
--- a/meta/recipes-devtools/rust/cargo_1.66.1.bb
+++ b/meta/recipes-devtools/rust/cargo_1.67.0.bb
diff --git a/meta/recipes-devtools/rust/files/crossbeam_atomic.patch b/meta/recipes-devtools/rust/files/crossbeam_atomic.patch
index b24ac439c6..51dd3c5f65 100644
--- a/meta/recipes-devtools/rust/files/crossbeam_atomic.patch
+++ b/meta/recipes-devtools/rust/files/crossbeam_atomic.patch
@@ -17,10 +17,10 @@ to create a patch that upstream might accept.
17Upstream-Status: Submitted [https://github.com/crossbeam-rs/crossbeam/pull/922] 17Upstream-Status: Submitted [https://github.com/crossbeam-rs/crossbeam/pull/922]
18Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 18Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
19 19
20Index: rustc-1.66.0-src/vendor/crossbeam-utils/build.rs 20Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/build.rs
21=================================================================== 21===================================================================
22--- rustc-1.66.0-src.orig/vendor/crossbeam-utils/build.rs 22--- rustc-1.66.0-src.orig/vendor/crossbeam-utils-0.8.12/build.rs
23+++ rustc-1.66.0-src/vendor/crossbeam-utils/build.rs 23+++ rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/build.rs
24@@ -29,7 +29,7 @@ use std::env; 24@@ -29,7 +29,7 @@ use std::env;
25 include!("no_atomic.rs"); 25 include!("no_atomic.rs");
26 26
@@ -39,10 +39,10 @@ Index: rustc-1.66.0-src/vendor/crossbeam-utils/build.rs
39 39
40 // Note that this is `no_`*, not `has_*`. This allows treating as the latest 40 // Note that this is `no_`*, not `has_*`. This allows treating as the latest
41 // stable rustc is used when the build script doesn't run. This is useful 41 // stable rustc is used when the build script doesn't run. This is useful
42Index: rustc-1.66.0-src/vendor/crossbeam-utils/.cargo-checksum.json 42Index: rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json
43=================================================================== 43===================================================================
44--- rustc-1.66.0-src.orig/vendor/crossbeam-utils/.cargo-checksum.json 44--- rustc-1.66.0-src.orig/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json
45+++ rustc-1.66.0-src/vendor/crossbeam-utils/.cargo-checksum.json 45+++ rustc-1.66.0-src/vendor/crossbeam-utils-0.8.12/.cargo-checksum.json
46@@ -1 +1 @@ 46@@ -1 +1 @@
47-{"files":{"CHANGELOG.md":"65d3e11edf9498bdbc930c8c3878b7d3a90c1a0b1698597dc4a396a547fa0948","Cargo.toml":"1e4259a5a47271e8ae040b91e17652b5a4e0e7e45c3f22de5008db276f3a50bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"4859f9c926c230023e861bf01c4b225b460035faf8cf6240108530efedbb747f","no_atomic.rs":"f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c","src/atomic/atomic_cell.rs":"0fc99463e633144c5d59d39c35b5477da1f1b90f5448cadc37454b7f4b97707e","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"8fd5e3dcccc05860680e49c8498de8096bee9140bcfee8723d97117106a020d0","src/cache_padded.rs":"8bb8925e2df44224ffa29f31a2f9c08d88d8bd3df6c1ce47003598225055fdb5","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"91f3a7d4ee8d9e06b6558d180e8a0df08ff5c6cef612b4ce4790f9f75cb34f84","src/sync/sharded_lock.rs":"6391b3b99b194b8e0888446c2dec340e4fb095753bcf0c1a80bc654f9c8be0e3","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"21cf9b3e965529e5c0a6ff8fc1ec846bfe0006c41deb238a149be8d07384e955","tests/atomic_cell.rs":"bf8bc869c922a1cbf929c3b741bae0cae98f2157f572b5a4eb2873d20a407c22","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"} 47-{"files":{"CHANGELOG.md":"65d3e11edf9498bdbc930c8c3878b7d3a90c1a0b1698597dc4a396a547fa0948","Cargo.toml":"1e4259a5a47271e8ae040b91e17652b5a4e0e7e45c3f22de5008db276f3a50bf","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"2a19af38a52dd965c2d66bb39f90a85b430b51ee9ccb29e9e1978ee7091e5087","benches/atomic_cell.rs":"c927eb3cd1e5ecc4b91adbc3bde98af15ffab4086190792ba64d5cde0e24df3d","build.rs":"4859f9c926c230023e861bf01c4b225b460035faf8cf6240108530efedbb747f","no_atomic.rs":"f58085b9d0666ccf62e0ae17fb5dae937c0a86fcc55dc0ae04ad8659e696a49c","src/atomic/atomic_cell.rs":"0fc99463e633144c5d59d39c35b5477da1f1b90f5448cadc37454b7f4b97707e","src/atomic/consume.rs":"7a7736fcd64f6473dfea7653559ffc5e1a2a234df43835f8aa8734862145ac15","src/atomic/mod.rs":"94193895fa03cece415e8d7be700b73a9a8a7015774ca821253438607f9b0736","src/atomic/seq_lock.rs":"27182e6b87a9db73c5f6831759f8625f9fcdec3c2828204c444aef04f427735a","src/atomic/seq_lock_wide.rs":"9888dd03116bb89ca36d4ab8d5a0b5032107a2983a7eb8024454263b09080088","src/backoff.rs":"8fd5e3dcccc05860680e49c8498de8096bee9140bcfee8723d97117106a020d0","src/cache_padded.rs":"8bb8925e2df44224ffa29f31a2f9c08d88d8bd3df6c1ce47003598225055fdb5","src/lib.rs":"6f1bcf157abe06ad8458a53e865bf8efab9fad4a9424790147cee8fefb3795d8","src/sync/mod.rs":"eca73c04f821859b8434d2b93db87d160dc6a3f65498ca201cd40d732ca4c134","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/parker.rs":"91f3a7d4ee8d9e06b6558d180e8a0df08ff5c6cef612b4ce4790f9f75cb34f84","src/sync/sharded_lock.rs":"6391b3b99b194b8e0888446c2dec340e4fb095753bcf0c1a80bc654f9c8be0e3","src/sync/wait_group.rs":"3e339aab014f50e214fea535c841755113ea058153378ed54e50a4acb403c937","src/thread.rs":"21cf9b3e965529e5c0a6ff8fc1ec846bfe0006c41deb238a149be8d07384e955","tests/atomic_cell.rs":"bf8bc869c922a1cbf929c3b741bae0cae98f2157f572b5a4eb2873d20a407c22","tests/cache_padded.rs":"1bfaff8354c8184e1ee1f902881ca9400b60effb273b0d3f752801a483d2b66d","tests/parker.rs":"6def4721287d9d70b1cfd63ebb34e1c83fbb3376edbad2bc8aac6ef69dd99d20","tests/sharded_lock.rs":"314adeb8a651a28935f7a49c9a261b8fa1fd82bf6a16c865a5aced6216d7e40b","tests/thread.rs":"9a7d7d3028c552fd834c68598b04a1cc252a816bc20ab62cec060d6cd09cab10","tests/wait_group.rs":"02661c2a820a5abe8b0c8fe15a6650aead707b57cdda0610d1b09a2680ed6969"},"package":"edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"}
48\ No newline at end of file 48\ No newline at end of file
diff --git a/meta/recipes-devtools/rust/files/hardcodepaths.patch b/meta/recipes-devtools/rust/files/hardcodepaths.patch
index 178f354cf8..cb99e8b011 100644
--- a/meta/recipes-devtools/rust/files/hardcodepaths.patch
+++ b/meta/recipes-devtools/rust/files/hardcodepaths.patch
@@ -5,18 +5,6 @@ to resolve these issues properly upstream.
5Upstream-Status: Inappropriate [patches need rework] 5Upstream-Status: Inappropriate [patches need rework]
6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7 7
8Index: rustc-1.66.0-src/src/tools/clippy/src/driver.rs
9===================================================================
10--- rustc-1.66.0-src.orig/src/tools/clippy/src/driver.rs
11+++ rustc-1.66.0-src/src/tools/clippy/src/driver.rs
12@@ -259,7 +259,6 @@ pub fn main() {
13 .and_then(|out| String::from_utf8(out.stdout).ok())
14 .map(|s| PathBuf::from(s.trim()))
15 })
16- .or_else(|| option_env!("SYSROOT").map(PathBuf::from))
17 .or_else(|| {
18 let home = option_env!("RUSTUP_HOME")
19 .or(option_env!("MULTIRUST_HOME"))
20Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs 8Index: rustc-1.66.0-src/compiler/rustc_codegen_llvm/src/context.rs
21=================================================================== 9===================================================================
22--- rustc-1.66.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs 10--- rustc-1.66.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs
diff --git a/meta/recipes-devtools/rust/libstd-rs_1.66.1.bb b/meta/recipes-devtools/rust/libstd-rs_1.67.0.bb
index 8802e9790c..f4e5abc0cc 100644
--- a/meta/recipes-devtools/rust/libstd-rs_1.66.1.bb
+++ b/meta/recipes-devtools/rust/libstd-rs_1.67.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Rust standard libaries"
2HOMEPAGE = "http://www.rust-lang.org" 2HOMEPAGE = "http://www.rust-lang.org"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "(MIT | Apache-2.0) & Unicode-TOU" 4LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
5LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=92289ed52a60b63ab715612ad2915603" 5LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
6 6
7require rust-source.inc 7require rust-source.inc
8 8
diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.66.1.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.67.0.bb
index 55865238ab..55865238ab 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian_1.66.1.bb
+++ b/meta/recipes-devtools/rust/rust-cross-canadian_1.67.0.bb
diff --git a/meta/recipes-devtools/rust/rust-llvm_1.66.1.bb b/meta/recipes-devtools/rust/rust-llvm_1.67.0.bb
index 4cc57d12ae..4da11da8ef 100644
--- a/meta/recipes-devtools/rust/rust-llvm_1.66.1.bb
+++ b/meta/recipes-devtools/rust/rust-llvm_1.67.0.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.rust-lang.org"
4 4
5# check src/llvm-project/llvm/CMakeLists.txt for llvm version in use 5# check src/llvm-project/llvm/CMakeLists.txt for llvm version in use
6# 6#
7LLVM_RELEASE = "15.0.2" 7LLVM_RELEASE = "15.0.6"
8 8
9require rust-source.inc 9require rust-source.inc
10 10
@@ -37,6 +37,7 @@ EXTRA_OECMAKE = " \
37 -DLLVM_BUILD_DOCS=OFF \ 37 -DLLVM_BUILD_DOCS=OFF \
38 -DLLVM_ENABLE_TERMINFO=OFF \ 38 -DLLVM_ENABLE_TERMINFO=OFF \
39 -DLLVM_ENABLE_ZLIB=OFF \ 39 -DLLVM_ENABLE_ZLIB=OFF \
40 -DLLVM_ENABLE_ZSTD=OFF \
40 -DLLVM_ENABLE_LIBXML2=OFF \ 41 -DLLVM_ENABLE_LIBXML2=OFF \
41 -DLLVM_ENABLE_FFI=OFF \ 42 -DLLVM_ENABLE_FFI=OFF \
42 -DLLVM_INSTALL_UTILS=ON \ 43 -DLLVM_INSTALL_UTILS=ON \
diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc
index 25192c9f76..d5317279db 100644
--- a/meta/recipes-devtools/rust/rust-snapshot.inc
+++ b/meta/recipes-devtools/rust/rust-snapshot.inc
@@ -3,30 +3,61 @@
3## Rust is self-hosting and bootstraps itself with a pre-built previous version of itself. 3## Rust is self-hosting and bootstraps itself with a pre-built previous version of itself.
4## The exact (previous) version that has been used is specified in the source tarball. 4## The exact (previous) version that has been used is specified in the source tarball.
5## The version is replicated here. 5## The version is replicated here.
6## TODO: find a way to add additional SRC_URIs based on the contents of an
7## earlier SRC_URI.
8 6
9SNAPSHOT_VERSION = "1.65.0" 7SNAPSHOT_VERSION = "1.66.1"
10 8
11# TODO: Add hashes for other architecture toolchains as well. Make a script? 9SRC_URI[cargo-snapshot-aarch64.sha256sum] = "61736a6ec61a4eaa9a7b3f219d9f8166ae97c1acd54b5e904c15fb8caff06250"
12SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "2b588cd2d49688c0c33b7466614123e8fe4c910f4d802fc0ff0662b1772816a9" 10SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "9d96ba6a5a255339cd04af079d906753d56c85503c727279c227d24bd4987e24"
13SRC_URI[rustc-snapshot-x86_64.sha256sum] = "62b89786e195fc5a8a262f83118d6689832b24228c9d303cba8ac14dc1e9adc8" 11SRC_URI[rustc-snapshot-aarch64.sha256sum] = "b4d842594ba11a84712c2d1bbf7f7945cfcc2485c72861a23b488fefba5c6a45"
14SRC_URI[cargo-snapshot-x86_64.sha256sum] = "82547aacaf42fc3c2970ec31b96751dfbeba3dffe1a042a3780bd670c29a89bf"
15 12
16SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "735b681c8a6e60925c76d6cc899e78b4cb4562ada24a1f265b2021c1faad78ad" 13SRC_URI[cargo-snapshot-i686.sha256sum] = "fb0c1aa922c4e41fead9d35090769309cb45648d6f77ccbe8d2ba125a75cc2af"
17SRC_URI[rustc-snapshot-aarch64.sha256sum] = "67c3d3545fd898c1383071c0f6296453565e0da10903c50652d7bf679b53e8a2" 14SRC_URI[rust-std-snapshot-i686.sha256sum] = "b32cbbb9002f8a20b302823a2ff122a91f077b5e1a7bc1340de690ded86bf10b"
18SRC_URI[cargo-snapshot-aarch64.sha256sum] = "3fd483c0d58673ab69862824408c8a48612827ddcdeaaca0f8fbe5ca02214a4c" 15SRC_URI[rustc-snapshot-i686.sha256sum] = "e2ab464f43d6319ddb9796cbfacd444dc40f3d0e7503d672c23ecbe0daf11e1c"
19 16
20SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "ce18b44300f7d5d94856cef5b270ba010061fafa411beb9782207e26cbab88a6" 17SRC_URI[cargo-snapshot-mips.sha256sum] = "0f03d6d35b6044dc81a4d5eb9bd42c9d1e8c0e85363f960ff921ebe46294ae45"
21SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "a6ce7aadd10a3fd84fe4717a59378421a65b101b61f27eed8b09336b8daf62cf" 18SRC_URI[rust-std-snapshot-mips.sha256sum] = "e6029b4cec5d6c06c34a0dbec614fa252fdc8cf31013d6e561112cf90f742568"
22SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "9393de910df7cd6947e380460a1144ac2373a36c776c7367a81212a51a92d9a7" 19SRC_URI[rustc-snapshot-mips.sha256sum] = "64ad92525ae1f018e08c055d7892e0fc613437bde8cf614b1c2a8986488290e7"
20
21SRC_URI[cargo-snapshot-mipsel.sha256sum] = "74d757a456d2fbb418c253db203c0bb3f71d797e4ab3e2804b6c594a18e0f199"
22SRC_URI[rust-std-snapshot-mipsel.sha256sum] = "8bfa3d6079c6df049978fe61b1ccaf992aecd006e23df2439ecfc883bd8bc31b"
23SRC_URI[rustc-snapshot-mipsel.sha256sum] = "f2674d60ce52c49048e9823af57aae24bb6722e8998783819ec884222caeccf3"
24
25SRC_URI[cargo-snapshot-powerpc.sha256sum] = "f771fa4294c8e0d5d0e58129fe9d4e0913566dd43523b6f0af19a08004004df8"
26SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "417b12a9bf090d694514937cd8c321ed625f155248f63c0de8207b17fa4b35b1"
27SRC_URI[rustc-snapshot-powerpc.sha256sum] = "ff16d02c100086175b9fbcfff4d3705fb4f5b58a6506ec7667dc86c56b8bb3c7"
28
29SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "9a933d39e6b028e73db9cc0959af84128824e0b11554e3a0171cad7635a343c7"
30SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "7074c4ea9fcc683ceb0adcca6ba07544a1d91f0e5d2a4cf14c81eb14316ebf35"
31SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "f5bff79d517e2f721839462881331bdc1b8323a434f4ebe0529f93213adb2a24"
32
33SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "29fa2e003f4bf3e37a3fb506d5b7ab19eb6412b5966d865e082b354637d5d84a"
34SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "4c64a09be872b5832b50d681fbe29691b6a5d3e23ee5535020fa22b8b453c770"
35SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "3b4322b519b0f7fbcf88511b2061be1499921517d810d7696be58a16467d4589"
36
37SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "f362cf575fde92f988d5b1fe19fd463a1905d8d2a3844168034df49b1dffb10b"
38SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "776eff6f451845e88224714ee6da7819e34f01b7625bf927394c2b91e5c8243c"
39SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "84bea70d3acb6af04ae4c0f49f904bba4e2644b92c5996aacbafd7610dd0e147"
40
41SRC_URI[cargo-snapshot-s390x.sha256sum] = "f69ea091fa1ee4871a46cb9fa1da5b81fa2980687f3bedbc4677a4a82f8da0c0"
42SRC_URI[rust-std-snapshot-s390x.sha256sum] = "51d1567e1d28e43c2165886f5a4955dcdaa41aa5ddcec5fb08200491fd1f6062"
43SRC_URI[rustc-snapshot-s390x.sha256sum] = "25a047db8ec0627bb7054eafe6edca6ce4c473b30d6766b30cbff1c536d0673b"
44
45SRC_URI[cargo-snapshot-x86_64.sha256sum] = "a636f83eb2327a66f484b9592ab305c6642df16fc80d0d1cb727e766a60da904"
46SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "c5e2c9b160bd8d99514f13cfbc0e42a722fd9ca14e6aaca4b9b77731a7a48377"
47SRC_URI[rustc-snapshot-x86_64.sha256sum] = "242855e2626860aede6957dc56481cc02acf8cad12fa5bbbcbd93f9c51f0b3ad"
48
49SRC_URI[rust-std-snapshot-i586.sha256sum] = "90eb8e2490283930e682b79842d664d4867414563353d53dafc47eccf44aea17"
50
51SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "3aee03fa61c28bb242023efb09a22e38a76b075cc72bcad9894560be8b28a927"
23 52
24SRC_URI += " \ 53SRC_URI += " \
25 https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ 54 ${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
26 https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ 55 ${RUST_DIST_SERVER}/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
27 https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \ 56 ${RUST_DIST_SERVER}/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
28" 57"
29 58
59RUST_DIST_SERVER = "https://static.rust-lang.org"
60
30RUST_STD_SNAPSHOT = "rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" 61RUST_STD_SNAPSHOT = "rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
31RUSTC_SNAPSHOT = "rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" 62RUSTC_SNAPSHOT = "rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
32CARGO_SNAPSHOT = "cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu" 63CARGO_SNAPSHOT = "cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc
index 22e97174a9..268e17bcf8 100644
--- a/meta/recipes-devtools/rust/rust-source.inc
+++ b/meta/recipes-devtools/rust/rust-source.inc
@@ -7,7 +7,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
7 file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \ 7 file://0001-Do-not-use-LFS64-on-linux-with-musl.patch;patchdir=${RUSTSRC} \
8 file://zlib-off64_t.patch;patchdir=${RUSTSRC} \ 8 file://zlib-off64_t.patch;patchdir=${RUSTSRC} \
9" 9"
10SRC_URI[rust.sha256sum] = "07ac4e6c93e0d8ecfaf3b86c4c78bbbde3f5be675f0334e7fb343cb4a0b81ebe" 10SRC_URI[rust.sha256sum] = "9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d"
11 11
12RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src" 12RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"
13 13
diff --git a/meta/recipes-devtools/rust/rust_1.66.1.bb b/meta/recipes-devtools/rust/rust_1.67.0.bb
index eba933dded..f4ac8bc635 100644
--- a/meta/recipes-devtools/rust/rust_1.66.1.bb
+++ b/meta/recipes-devtools/rust/rust_1.67.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "Rust compiler and runtime libaries"
2HOMEPAGE = "http://www.rust-lang.org" 2HOMEPAGE = "http://www.rust-lang.org"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "(MIT | Apache-2.0) & Unicode-TOU" 4LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
5LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=92289ed52a60b63ab715612ad2915603" 5LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
6 6
7inherit rust 7inherit rust
8inherit cargo_common 8inherit cargo_common