From 5efebf3be01e239f537eee9418a4414e0e4d9ab0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Sun, 10 Oct 2021 21:09:57 +0200 Subject: rust: update 1.54.0 -> 1.55.0 (From OE-Core rev: a21705c33a6a69e9a625b8a75d76b76bd078aba2) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../cargo/cargo-cross-canadian_1.54.0.bb | 6 ------ .../cargo/cargo-cross-canadian_1.55.0.bb | 6 ++++++ meta/recipes-devtools/cargo/cargo_1.54.0.bb | 4 ---- meta/recipes-devtools/cargo/cargo_1.55.0.bb | 4 ++++ meta/recipes-devtools/rust/libstd-rs_1.54.0.bb | 11 ----------- meta/recipes-devtools/rust/libstd-rs_1.55.0.bb | 11 +++++++++++ .../rust/rust-cross-canadian_1.54.0.bb | 6 ------ .../rust/rust-cross-canadian_1.55.0.bb | 6 ++++++ meta/recipes-devtools/rust/rust-cross_1.54.0.bb | 2 -- meta/recipes-devtools/rust/rust-cross_1.55.0.bb | 2 ++ meta/recipes-devtools/rust/rust-llvm_1.54.0.bb | 5 ----- meta/recipes-devtools/rust/rust-llvm_1.55.0.bb | 5 +++++ meta/recipes-devtools/rust/rust-snapshot.inc | 16 ++++++++-------- meta/recipes-devtools/rust/rust-source.inc | 2 +- .../rust/rust-tools-cross-canadian_1.54.0.bb | 6 ------ .../rust/rust-tools-cross-canadian_1.55.0.bb | 6 ++++++ meta/recipes-devtools/rust/rust_1.54.0.bb | 20 -------------------- meta/recipes-devtools/rust/rust_1.55.0.bb | 20 ++++++++++++++++++++ 18 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 meta/recipes-devtools/cargo/cargo-cross-canadian_1.54.0.bb create mode 100644 meta/recipes-devtools/cargo/cargo-cross-canadian_1.55.0.bb delete mode 100644 meta/recipes-devtools/cargo/cargo_1.54.0.bb create mode 100644 meta/recipes-devtools/cargo/cargo_1.55.0.bb delete mode 100644 meta/recipes-devtools/rust/libstd-rs_1.54.0.bb create mode 100644 meta/recipes-devtools/rust/libstd-rs_1.55.0.bb delete mode 100644 meta/recipes-devtools/rust/rust-cross-canadian_1.54.0.bb create mode 100644 meta/recipes-devtools/rust/rust-cross-canadian_1.55.0.bb delete mode 100644 meta/recipes-devtools/rust/rust-cross_1.54.0.bb create mode 100644 meta/recipes-devtools/rust/rust-cross_1.55.0.bb delete mode 100644 meta/recipes-devtools/rust/rust-llvm_1.54.0.bb create mode 100644 meta/recipes-devtools/rust/rust-llvm_1.55.0.bb delete mode 100644 meta/recipes-devtools/rust/rust-tools-cross-canadian_1.54.0.bb create mode 100644 meta/recipes-devtools/rust/rust-tools-cross-canadian_1.55.0.bb delete mode 100644 meta/recipes-devtools/rust/rust_1.54.0.bb create mode 100644 meta/recipes-devtools/rust/rust_1.55.0.bb (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian_1.54.0.bb b/meta/recipes-devtools/cargo/cargo-cross-canadian_1.54.0.bb deleted file mode 100644 index 63fd69107b..0000000000 --- a/meta/recipes-devtools/cargo/cargo-cross-canadian_1.54.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require recipes-devtools/rust/rust-source.inc -require recipes-devtools/rust/rust-snapshot.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/cargo-${PV}:" - -require cargo-cross-canadian.inc diff --git a/meta/recipes-devtools/cargo/cargo-cross-canadian_1.55.0.bb b/meta/recipes-devtools/cargo/cargo-cross-canadian_1.55.0.bb new file mode 100644 index 0000000000..63fd69107b --- /dev/null +++ b/meta/recipes-devtools/cargo/cargo-cross-canadian_1.55.0.bb @@ -0,0 +1,6 @@ +require recipes-devtools/rust/rust-source.inc +require recipes-devtools/rust/rust-snapshot.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/cargo-${PV}:" + +require cargo-cross-canadian.inc diff --git a/meta/recipes-devtools/cargo/cargo_1.54.0.bb b/meta/recipes-devtools/cargo/cargo_1.54.0.bb deleted file mode 100644 index eee58fc245..0000000000 --- a/meta/recipes-devtools/cargo/cargo_1.54.0.bb +++ /dev/null @@ -1,4 +0,0 @@ -require recipes-devtools/rust/rust-source.inc -require recipes-devtools/rust/rust-snapshot.inc -require cargo.inc -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/cargo/cargo_1.55.0.bb b/meta/recipes-devtools/cargo/cargo_1.55.0.bb new file mode 100644 index 0000000000..eee58fc245 --- /dev/null +++ b/meta/recipes-devtools/cargo/cargo_1.55.0.bb @@ -0,0 +1,4 @@ +require recipes-devtools/rust/rust-source.inc +require recipes-devtools/rust/rust-snapshot.inc +require cargo.inc +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/rust/libstd-rs_1.54.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.54.0.bb deleted file mode 100644 index cc30158d22..0000000000 --- a/meta/recipes-devtools/rust/libstd-rs_1.54.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require rust-source.inc -require libstd-rs.inc - -SRC_URI += " \ - file://0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch;patchdir=../../ \ - file://0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch;patchdir=../../ \ - file://0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch;patchdir=../../ \ - file://0008-Update-checksums-for-modified-files-for-rust-1.54.0-.patch;patchdir=../../ \ - " -# libstd moved from src/libstd to library/std in 1.47+ -S = "${RUSTSRC}/library/std" diff --git a/meta/recipes-devtools/rust/libstd-rs_1.55.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.55.0.bb new file mode 100644 index 0000000000..cc30158d22 --- /dev/null +++ b/meta/recipes-devtools/rust/libstd-rs_1.55.0.bb @@ -0,0 +1,11 @@ +require rust-source.inc +require libstd-rs.inc + +SRC_URI += " \ + file://0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch;patchdir=../../ \ + file://0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch;patchdir=../../ \ + file://0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch;patchdir=../../ \ + file://0008-Update-checksums-for-modified-files-for-rust-1.54.0-.patch;patchdir=../../ \ + " +# libstd moved from src/libstd to library/std in 1.47+ +S = "${RUSTSRC}/library/std" diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.54.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.54.0.bb deleted file mode 100644 index 766912c019..0000000000 --- a/meta/recipes-devtools/rust/rust-cross-canadian_1.54.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require rust-cross-canadian.inc -require rust-source.inc -require rust-snapshot.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/rust:" - diff --git a/meta/recipes-devtools/rust/rust-cross-canadian_1.55.0.bb b/meta/recipes-devtools/rust/rust-cross-canadian_1.55.0.bb new file mode 100644 index 0000000000..766912c019 --- /dev/null +++ b/meta/recipes-devtools/rust/rust-cross-canadian_1.55.0.bb @@ -0,0 +1,6 @@ +require rust-cross-canadian.inc +require rust-source.inc +require rust-snapshot.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/rust:" + diff --git a/meta/recipes-devtools/rust/rust-cross_1.54.0.bb b/meta/recipes-devtools/rust/rust-cross_1.54.0.bb deleted file mode 100644 index 3179d395d2..0000000000 --- a/meta/recipes-devtools/rust/rust-cross_1.54.0.bb +++ /dev/null @@ -1,2 +0,0 @@ -require rust-cross.inc -require rust-source.inc diff --git a/meta/recipes-devtools/rust/rust-cross_1.55.0.bb b/meta/recipes-devtools/rust/rust-cross_1.55.0.bb new file mode 100644 index 0000000000..3179d395d2 --- /dev/null +++ b/meta/recipes-devtools/rust/rust-cross_1.55.0.bb @@ -0,0 +1,2 @@ +require rust-cross.inc +require rust-source.inc diff --git a/meta/recipes-devtools/rust/rust-llvm_1.54.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.54.0.bb deleted file mode 100644 index 5e37798edd..0000000000 --- a/meta/recipes-devtools/rust/rust-llvm_1.54.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -# check src/llvm-project/llvm/CMakeLists.txt for llvm version in use -# -LLVM_RELEASE = "12.0.1" -require rust-source.inc -require rust-llvm.inc diff --git a/meta/recipes-devtools/rust/rust-llvm_1.55.0.bb b/meta/recipes-devtools/rust/rust-llvm_1.55.0.bb new file mode 100644 index 0000000000..5e37798edd --- /dev/null +++ b/meta/recipes-devtools/rust/rust-llvm_1.55.0.bb @@ -0,0 +1,5 @@ +# check src/llvm-project/llvm/CMakeLists.txt for llvm version in use +# +LLVM_RELEASE = "12.0.1" +require rust-source.inc +require rust-llvm.inc diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc index d448ffc7af..71ac102444 100644 --- a/meta/recipes-devtools/rust/rust-snapshot.inc +++ b/meta/recipes-devtools/rust/rust-snapshot.inc @@ -2,17 +2,17 @@ ## snapshot info is taken from rust/src/stage0.txt ## TODO: find a way to add additional SRC_URIs based on the contents of an ## earlier SRC_URI. -RS_VERSION = "1.53.0" -CARGO_VERSION = "1.53.0" +RS_VERSION = "1.54.0" +CARGO_VERSION = "1.54.0" # TODO: Add hashes for other architecture toolchains as well. Make a script? -SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "66d5257bbd194db08e67ca63a74cc80cdc4a36eaa30bf7dfe65861d9deaff7f7" -SRC_URI[rustc-snapshot-x86_64.sha256sum] = "9c2f0443a546dd18f1f020c7711a7b9864432545ceb812e79315c1e76508b193" -SRC_URI[cargo-snapshot-x86_64.sha256sum] = "e4437f6c83574fc60e183f4df439190f7610e4a669476802795645da66fbb83b" +SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "a22e19859b3c5032daac1633637546a986c51bdfa3ad0db6e394e6cc461f466b" +SRC_URI[rustc-snapshot-x86_64.sha256sum] = "eafc06aba7128ee8592c16d7e3ae7b877e82c5d9779c9d07099558ed7e286296" +SRC_URI[cargo-snapshot-x86_64.sha256sum] = "8a9c80b7dc5d47e6eafe173b81ad96244522c97d74214ba7da57a502d49b231c" -SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "fc261d0ff057c58b36057c30217bad1a29a9a3f257c70f5df88ad3f1d982386e" -SRC_URI[rustc-snapshot-aarch64.sha256sum] = "a857e5c615f6b5b3afc6b707ae007b3b4624585b0b2ba9b38b553114db37f8d5" -SRC_URI[cargo-snapshot-aarch64.sha256sum] = "4fa425a2d4633aeca67fa42695b3b9100f8b988dd1c21e60d6b2aa1164e55c0c" +SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "a1a77737d218087eb7d3613adcde2c9e383d758cdf128646a0ee63396145270b" +SRC_URI[rustc-snapshot-aarch64.sha256sum] = "0e771c06435b6fa3087ce054c7f2f94b8ee36717997f32f97e2e3425739ac2b4" +SRC_URI[cargo-snapshot-aarch64.sha256sum] = "b3b6e5358bf1ecd5d8d7e258a5632dac7d923b2aa8ab1c8c0f6aad62d9307b37" SRC_URI += " \ https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${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 a1042d5f87..b3feb6072e 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -1,4 +1,4 @@ -SRC_URI[rust.sha256sum] = "a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4" +SRC_URI[rust.sha256sum] = "aec85a7c1f40b7a40818a58ae13632f8a12cfaa4d3e2a10957d0e9d16dfdd556" SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust" RUSTSRC = "${WORKDIR}/rustc-${PV}-src" diff --git a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.54.0.bb b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.54.0.bb deleted file mode 100644 index 2d809d68f5..0000000000 --- a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.54.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require rust-tools-cross-canadian.inc -require rust-source.inc -require rust-snapshot.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/rust:" - diff --git a/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.55.0.bb b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.55.0.bb new file mode 100644 index 0000000000..2d809d68f5 --- /dev/null +++ b/meta/recipes-devtools/rust/rust-tools-cross-canadian_1.55.0.bb @@ -0,0 +1,6 @@ +require rust-tools-cross-canadian.inc +require rust-source.inc +require rust-snapshot.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/rust:" + diff --git a/meta/recipes-devtools/rust/rust_1.54.0.bb b/meta/recipes-devtools/rust/rust_1.54.0.bb deleted file mode 100644 index 036fb43334..0000000000 --- a/meta/recipes-devtools/rust/rust_1.54.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -require rust-target.inc -require rust-source.inc -require rust-snapshot.inc - -INSANE_SKIP:${PN}:class-native = "already-stripped" - -do_compile () { - rust_runx build --stage 2 -} - -rust_do_install() { - rust_runx install -} - -python () { - pn = d.getVar('PN') - - if not pn.endswith("-native"): - raise bb.parse.SkipRecipe("Rust recipe doesn't work for target builds at this time. Fixes welcome.") -} diff --git a/meta/recipes-devtools/rust/rust_1.55.0.bb b/meta/recipes-devtools/rust/rust_1.55.0.bb new file mode 100644 index 0000000000..036fb43334 --- /dev/null +++ b/meta/recipes-devtools/rust/rust_1.55.0.bb @@ -0,0 +1,20 @@ +require rust-target.inc +require rust-source.inc +require rust-snapshot.inc + +INSANE_SKIP:${PN}:class-native = "already-stripped" + +do_compile () { + rust_runx build --stage 2 +} + +rust_do_install() { + rust_runx install +} + +python () { + pn = d.getVar('PN') + + if not pn.endswith("-native"): + raise bb.parse.SkipRecipe("Rust recipe doesn't work for target builds at this time. Fixes welcome.") +} -- cgit v1.2.3-54-g00ecf