Re: [OE-core] [PATCH] rust: update from 1.62.1 to 1.63.0

[Randy MacLeod <randy.macleod@windriver.com>]

On 2022-08-14 20:35, Randy MacLeod wrote:
> On 2022-08-14 20:31, Randy MacLeod wrote:
>> Release notes:
>>     https://blog.rust-lang.org/2022/08/11/Rust-1.63.0.html
>>
>> This is a standard upgrade aside from the path for the
>> stage2 tools binaries (clippy, et.al.) changing.
>

Please ignore this patch.

I checked the logs and 'rustfmt' isn't being built for some machines
as shown below.


>
> I didn't check what the build status was before but
> so far I have:
>
> BUILDALL-QEMU LOG FOR rust
> START TIME: 2022-08-14_13:30:45
> HOSTNAME: ala-lpggp3
> HOST OS: Ubuntu 18.04.6 LTS
> HOST KERNEL: 5.4.0-122-generic
> ===============
> BUILD RESULTS:
> [glibc]
> FAIL: qemuriscv32
cp: cannot stat 
'build/x86_64-unknown-linux-gnu/stage2-tools/riscv32-poky-linux-gnu/release/rustfmt': 
No such file or directory

> PASS: qemuarmv5
> FAIL: qemumips

and:

cp: cannot stat 
'build/x86_64-unknown-linux-gnu/stage2-tools/mips-poky-linux-gnu/release/rustfmt': 
No such file or directory


It's odd that cargo-clippy and clippy-driver are present:

ls 
.../tmp/work/mips32r2-poky-linux/rust/1.63.0-r0/rustc-1.63.0-src/build/x86_64-unknown-linux-gnu/stage2-tools/mips-poky-linux-gnu/release/ 

build  cargo-clippy  cargo-clippy.d  clippy-driver clippy-driver.d  
deps  examples  incremental


../Randy

> PASS: qemux86-64
> PASS: qemuarm64
> PASS: qemumips64
> ...
>
> It's still running.
>
> I'll send the complete output tomorrow.
>
>
> ../Randy
>
>> Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
>> ---
>>   meta/conf/distro/include/tcmode-default.inc   |  2 +-
>>   .../{cargo_1.62.1.bb => cargo_1.63.0.bb}      |  0
>>   ...ibstd-rs_1.62.1.bb => libstd-rs_1.63.0.bb} |  0
>>   ....62.1.bb => rust-cross-canadian_1.63.0.bb} |  0
>>   ...ust-llvm_1.62.1.bb => rust-llvm_1.63.0.bb} |  0
>>   meta/recipes-devtools/rust/rust-snapshot.inc  | 24 +++++++++----------
>>   meta/recipes-devtools/rust/rust-source.inc    |  2 +-
>>   .../rust/{rust_1.62.1.bb => rust_1.63.0.bb}   |  4 ++--
>>   8 files changed, 16 insertions(+), 16 deletions(-)
>>   rename meta/recipes-devtools/cargo/{cargo_1.62.1.bb => 
>> cargo_1.63.0.bb} (100%)
>>   rename meta/recipes-devtools/rust/{libstd-rs_1.62.1.bb => 
>> libstd-rs_1.63.0.bb} (100%)
>>   rename meta/recipes-devtools/rust/{rust-cross-canadian_1.62.1.bb => 
>> rust-cross-canadian_1.63.0.bb} (100%)
>>   rename meta/recipes-devtools/rust/{rust-llvm_1.62.1.bb => 
>> rust-llvm_1.63.0.bb} (100%)
>>   rename meta/recipes-devtools/rust/{rust_1.62.1.bb => 
>> rust_1.63.0.bb} (92%)
>>
>> diff --git a/meta/conf/distro/include/tcmode-default.inc 
>> b/meta/conf/distro/include/tcmode-default.inc
>> index 31c9dd5065..52d0f7a79f 100644
>> --- a/meta/conf/distro/include/tcmode-default.inc
>> +++ b/meta/conf/distro/include/tcmode-default.inc
>> @@ -27,7 +27,7 @@ GOVERSION ?= "1.19%"
>>   # 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 ?= "14.0.6"
>> -RUSTVERSION ?= "1.62%"
>> +RUSTVERSION ?= "1.63%"
>>     PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
>>   PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
>> diff --git a/meta/recipes-devtools/cargo/cargo_1.62.1.bb 
>> b/meta/recipes-devtools/cargo/cargo_1.63.0.bb
>> similarity index 100%
>> rename from meta/recipes-devtools/cargo/cargo_1.62.1.bb
>> rename to meta/recipes-devtools/cargo/cargo_1.63.0.bb
>> diff --git a/meta/recipes-devtools/rust/libstd-rs_1.62.1.bb 
>> b/meta/recipes-devtools/rust/libstd-rs_1.63.0.bb
>> similarity index 100%
>> rename from meta/recipes-devtools/rust/libstd-rs_1.62.1.bb
>> rename to meta/recipes-devtools/rust/libstd-rs_1.63.0.bb
>> diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb 
>> b/meta/recipes-devtools/rust/rust-cross-canadian_1.63.0.bb
>> similarity index 100%
>> rename from meta/recipes-devtools/rust/rust-cross-canadian_1.62.1.bb
>> rename to meta/recipes-devtools/rust/rust-cross-canadian_1.63.0.bb
>> diff --git a/meta/recipes-devtools/rust/rust-llvm_1.62.1.bb 
>> b/meta/recipes-devtools/rust/rust-llvm_1.63.0.bb
>> similarity index 100%
>> rename from meta/recipes-devtools/rust/rust-llvm_1.62.1.bb
>> rename to meta/recipes-devtools/rust/rust-llvm_1.63.0.bb
>> diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc 
>> b/meta/recipes-devtools/rust/rust-snapshot.inc
>> index 3bd7b07cef..b9d7edd672 100644
>> --- a/meta/recipes-devtools/rust/rust-snapshot.inc
>> +++ b/meta/recipes-devtools/rust/rust-snapshot.inc
>> @@ -1,25 +1,25 @@
>>   ## This is information on the rust-snapshot (binary) used to build 
>> our current release.
>> -## snapshot info is taken from rust/src/stage0.txt
>> +## snapshot info is taken from rust/src/stage0.json
>>   ## 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.
>>   ## TODO: find a way to add additional SRC_URIs based on the 
>> contents of an
>>   ##       earlier SRC_URI.
>> -RS_VERSION = "1.61.0"
>> -CARGO_VERSION = "1.61.0"
>> +RS_VERSION = "1.62.0"
>> +CARGO_VERSION = "1.62.0"
>>     # TODO: Add hashes for other architecture toolchains as well. 
>> Make a script?
>> -SRC_URI[rust-std-snapshot-x86_64.sha256sum] = 
>> "270b07aa5f2de52255a117e1e587138d77375ce0d09a1d7fead085f29b3977e9"
>> -SRC_URI[rustc-snapshot-x86_64.sha256sum] = 
>> "21c4613f389ed130fbaaf88f1e984319f72b5fc10734569a5ba19e22ebb03abd"
>> -SRC_URI[cargo-snapshot-x86_64.sha256sum] = 
>> "9461727d754f865ef2a87479d40bbe4c5176f80963b7c50b7797bc8940d7a0a0"
>> +SRC_URI[rust-std-snapshot-x86_64.sha256sum] = 
>> "addfae87b6b1b521d98a50fdc5120990888a51bb397100062e9c558267c67c77"
>> +SRC_URI[rustc-snapshot-x86_64.sha256sum] = 
>> "e7f71f4ef09334ddc9ec8cbf2f958d654e36f580c95f8fec6d5c816ce256dbd6"
>> +SRC_URI[cargo-snapshot-x86_64.sha256sum] = 
>> "815c63119a9cf0282ff240c6444b6f867238763ee3dea182f10837ae7dbbb1d4"
>>   -SRC_URI[rust-std-snapshot-aarch64.sha256sum] = 
>> "57d60a519dbce12146849f7e72d55f3cffe9cdcbff8d58e90bb62d3c016bb5c0"
>> -SRC_URI[rustc-snapshot-aarch64.sha256sum] = 
>> "c996de6391e3ea94629fbc09b03bce186fcde345159f43ec95a82c500adb5e94"
>> -SRC_URI[cargo-snapshot-aarch64.sha256sum] = 
>> "a055e6cfd9b5f8938780db6179d2ef92990c714ce64278337d7edf3d29c8ab62"
>> +SRC_URI[rust-std-snapshot-aarch64.sha256sum] = 
>> "dd5df8a92af3e5d49a1122b9561821ebd72a9317884a37ecddae041e652a7563"
>> +SRC_URI[rustc-snapshot-aarch64.sha256sum] = 
>> "0fa320a19d41dcfc592bc006f5e9eda8e3b972598a26c96ad64eedd868516df3"
>> +SRC_URI[cargo-snapshot-aarch64.sha256sum] = 
>> "475038ecacca9ff586cad2082d5d950544b0d581a2a287facc7d899aae488813"
>>   -SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = 
>> "36c0ccff14c80419507561db050f9533f0abd43fc50f3ddb859c10df74b1c351"
>> -SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = 
>> "dc54893d747e4f3330515caa75e404f78c6c5475a1216d1428f5e7ce1c2e9602"
>> -SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = 
>> "09817011ff1ef4b7006387c7cabb6a059731792a9372533dec7d87e7f014444b"
>> +SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = 
>> "d6678b7c971f3adbe7f820adae669d03a314468441e2907747c76eca98e0be92"
>> +SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = 
>> "b66d0bc6dbfdc0d4b826f787ec4e772dea8e3d2015cecbe2105632d468c28dcb"
>> +SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = 
>> "016257f1641693008068bd086fec66d68550d1778f6aea9d06c9b263fca392d5"
>>     SRC_URI += " \
>> https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components 
>> \
>> diff --git a/meta/recipes-devtools/rust/rust-source.inc 
>> b/meta/recipes-devtools/rust/rust-source.inc
>> index dbcef2cbc2..47bfbe98a7 100644
>> --- a/meta/recipes-devtools/rust/rust-source.inc
>> +++ b/meta/recipes-devtools/rust/rust-source.inc
>> @@ -1,5 +1,5 @@
>>   SRC_URI += 
>> "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
>> -SRC_URI[rust.sha256sum] = 
>> "02066a93c2f6596cc046a897d5716c86e3607c1cd0f54db9a867ae8c8265072e"
>> +SRC_URI[rust.sha256sum] = 
>> "8f44af6dc44cc4146634a4dd5e4cc5470b3052a2337019b870c0e025e8987e0c"
>>     SRC_URI:append:class-target:pn-rust = " file://hardcodepaths.patch"
>>   SRC_URI:append:class-nativesdk:pn-nativesdk-rust = " 
>> file://hardcodepaths.patch"
>> diff --git a/meta/recipes-devtools/rust/rust_1.62.1.bb 
>> b/meta/recipes-devtools/rust/rust_1.63.0.bb
>> similarity index 92%
>> rename from meta/recipes-devtools/rust/rust_1.62.1.bb
>> rename to meta/recipes-devtools/rust/rust_1.63.0.bb
>> index 81923c3331..3081cd5ef3 100644
>> --- a/meta/recipes-devtools/rust/rust_1.62.1.bb
>> +++ b/meta/recipes-devtools/rust/rust_1.63.0.bb
>> @@ -43,7 +43,7 @@ rust_do_install:class-nativesdk() {
>>         install -d ${D}${bindir}
>>       for i in cargo-clippy clippy-driver rustfmt; do
>> -        cp build/${RUST_BUILD_SYS}/stage2-tools-bin/$i ${D}${bindir}
>> +        cp 
>> build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i 
>> ${D}${bindir}
>>           chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
>>       done
>>   @@ -60,7 +60,7 @@ rust_do_install:class-target() {
>>         install -d ${D}${bindir}
>>       for i in cargo-clippy clippy-driver rustfmt; do
>> -        cp build/${RUST_BUILD_SYS}/stage2-tools-bin/$i ${D}${bindir}
>> +        cp 
>> build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i 
>> ${D}${bindir}
>>           chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
>>       done
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#169339): 
>> https://lists.openembedded.org/g/openembedded-core/message/169339
>> Mute This Topic: https://lists.openembedded.org/mt/93027065/3616765
>> Group Owner: openembedded-core+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
>> [randy.macleod@windriver.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>
>

-- 
# Randy MacLeod
# Wind River Linux