From: Alexander Kanavin Date: Sun, 10 Oct 2021 19:09:56 +0000 (+0200) Subject: rust: drop PV from include file names X-Git-Tag: uninative-3.5~1279 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f7a6b23d99fba5855cfb34788199877a14206293;p=openembedded-core.git rust: drop PV from include file names This complicates (semi) automated upgrades, and isn't necessary as we carry only a single version of the toolchain. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- 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 index dba400bcfb..63fd69107b 100644 --- a/meta/recipes-devtools/cargo/cargo-cross-canadian_1.54.0.bb +++ b/meta/recipes-devtools/cargo/cargo-cross-canadian_1.54.0.bb @@ -1,5 +1,5 @@ -require recipes-devtools/rust/rust-source-${PV}.inc -require recipes-devtools/rust/rust-snapshot-${PV}.inc +require recipes-devtools/rust/rust-source.inc +require recipes-devtools/rust/rust-snapshot.inc FILESEXTRAPATHS:prepend := "${THISDIR}/cargo-${PV}:" diff --git a/meta/recipes-devtools/cargo/cargo_1.54.0.bb b/meta/recipes-devtools/cargo/cargo_1.54.0.bb index 175f544d66..eee58fc245 100644 --- a/meta/recipes-devtools/cargo/cargo_1.54.0.bb +++ b/meta/recipes-devtools/cargo/cargo_1.54.0.bb @@ -1,4 +1,4 @@ -require recipes-devtools/rust/rust-source-${PV}.inc -require recipes-devtools/rust/rust-snapshot-${PV}.inc +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/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch b/meta/recipes-devtools/rust/libstd-rs/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs-1.54.0/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch rename to meta/recipes-devtools/rust/libstd-rs/0005-Add-base-definitions-for-riscv64-musl-libc-0.2.93.patch diff --git a/meta/recipes-devtools/rust/libstd-rs-1.54.0/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch b/meta/recipes-devtools/rust/libstd-rs/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs-1.54.0/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch rename to meta/recipes-devtools/rust/libstd-rs/0006-FIXUP-linux-musl-mod.rs-add-riscv64-to-b64-set-libc-.patch diff --git a/meta/recipes-devtools/rust/libstd-rs-1.54.0/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch b/meta/recipes-devtools/rust/libstd-rs/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs-1.54.0/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch rename to meta/recipes-devtools/rust/libstd-rs/0007-FIXUP-Correct-definitions-to-match-musl-libc-0.2.93.patch diff --git a/meta/recipes-devtools/rust/libstd-rs-1.54.0/0008-Update-checksums-for-modified-files-for-rust-1.54.0-.patch b/meta/recipes-devtools/rust/libstd-rs/0008-Update-checksums-for-modified-files-for-rust-1.54.0-.patch similarity index 100% rename from meta/recipes-devtools/rust/libstd-rs-1.54.0/0008-Update-checksums-for-modified-files-for-rust-1.54.0-.patch rename to meta/recipes-devtools/rust/libstd-rs/0008-Update-checksums-for-modified-files-for-rust-1.54.0-.patch diff --git a/meta/recipes-devtools/rust/libstd-rs_1.54.0.bb b/meta/recipes-devtools/rust/libstd-rs_1.54.0.bb index 1239f6a176..cc30158d22 100644 --- a/meta/recipes-devtools/rust/libstd-rs_1.54.0.bb +++ b/meta/recipes-devtools/rust/libstd-rs_1.54.0.bb @@ -1,4 +1,4 @@ -require rust-source-${PV}.inc +require rust-source.inc require libstd-rs.inc SRC_URI += " \ 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 index a5d02eb8d7..766912c019 100644 --- a/meta/recipes-devtools/rust/rust-cross-canadian_1.54.0.bb +++ b/meta/recipes-devtools/rust/rust-cross-canadian_1.54.0.bb @@ -1,6 +1,6 @@ require rust-cross-canadian.inc -require rust-source-${PV}.inc -require rust-snapshot-${PV}.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 index ddc25d36b5..3179d395d2 100644 --- a/meta/recipes-devtools/rust/rust-cross_1.54.0.bb +++ b/meta/recipes-devtools/rust/rust-cross_1.54.0.bb @@ -1,2 +1,2 @@ require rust-cross.inc -require rust-source-${PV}.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 index 81b2bd12b7..5e37798edd 100644 --- a/meta/recipes-devtools/rust/rust-llvm_1.54.0.bb +++ b/meta/recipes-devtools/rust/rust-llvm_1.54.0.bb @@ -1,5 +1,5 @@ # check src/llvm-project/llvm/CMakeLists.txt for llvm version in use # LLVM_RELEASE = "12.0.1" -require rust-source-${PV}.inc +require rust-source.inc require rust-llvm.inc diff --git a/meta/recipes-devtools/rust/rust-snapshot-1.54.0.inc b/meta/recipes-devtools/rust/rust-snapshot-1.54.0.inc deleted file mode 100644 index 598f4ed109..0000000000 --- a/meta/recipes-devtools/rust/rust-snapshot-1.54.0.inc +++ /dev/null @@ -1,18 +0,0 @@ -require rust-snapshot.inc - -## This is information on the rust-snapshot (binary) used to build our current release. -## 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" - -# 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-aarch64.sha256sum] = "fc261d0ff057c58b36057c30217bad1a29a9a3f257c70f5df88ad3f1d982386e" -SRC_URI[rustc-snapshot-aarch64.sha256sum] = "a857e5c615f6b5b3afc6b707ae007b3b4624585b0b2ba9b38b553114db37f8d5" -SRC_URI[cargo-snapshot-aarch64.sha256sum] = "4fa425a2d4633aeca67fa42695b3b9100f8b988dd1c21e60d6b2aa1164e55c0c" - diff --git a/meta/recipes-devtools/rust/rust-snapshot.inc b/meta/recipes-devtools/rust/rust-snapshot.inc index 79d03afd1b..d448ffc7af 100644 --- a/meta/recipes-devtools/rust/rust-snapshot.inc +++ b/meta/recipes-devtools/rust/rust-snapshot.inc @@ -1,3 +1,19 @@ +## This is information on the rust-snapshot (binary) used to build our current release. +## 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" + +# 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-aarch64.sha256sum] = "fc261d0ff057c58b36057c30217bad1a29a9a3f257c70f5df88ad3f1d982386e" +SRC_URI[rustc-snapshot-aarch64.sha256sum] = "a857e5c615f6b5b3afc6b707ae007b3b4624585b0b2ba9b38b553114db37f8d5" +SRC_URI[cargo-snapshot-aarch64.sha256sum] = "4fa425a2d4633aeca67fa42695b3b9100f8b988dd1c21e60d6b2aa1164e55c0c" + SRC_URI += " \ https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \ https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \ diff --git a/meta/recipes-devtools/rust/rust-source-1.54.0.inc b/meta/recipes-devtools/rust/rust-source-1.54.0.inc deleted file mode 100644 index 335c7ceb45..0000000000 --- a/meta/recipes-devtools/rust/rust-source-1.54.0.inc +++ /dev/null @@ -1,3 +0,0 @@ -require rust-source.inc - -SRC_URI[rust.sha256sum] = "a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4" diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index 1529ecfafe..a1042d5f87 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -1,3 +1,4 @@ +SRC_URI[rust.sha256sum] = "a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4" 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 index 053147ba46..2d809d68f5 100644 --- 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 @@ -1,6 +1,6 @@ require rust-tools-cross-canadian.inc -require rust-source-${PV}.inc -require rust-snapshot-${PV}.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 index e7d8d70c26..036fb43334 100644 --- a/meta/recipes-devtools/rust/rust_1.54.0.bb +++ b/meta/recipes-devtools/rust/rust_1.54.0.bb @@ -1,6 +1,6 @@ require rust-target.inc -require rust-source-${PV}.inc -require rust-snapshot-${PV}.inc +require rust-source.inc +require rust-snapshot.inc INSANE_SKIP:${PN}:class-native = "already-stripped"