diff --git a/recipes-devtools/cargo/cargo_1.31.1.bb b/recipes-devtools/cargo/cargo_1.31.1.bb deleted file mode 100644 index 88fbe87..0000000 --- a/recipes-devtools/cargo/cargo_1.31.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-devtools/rust/rust-source-${PV}.inc -require recipes-devtools/rust/rust-snapshot-${PV}.inc -require cargo.inc - -# From 1.32.0, the vendor and target directory has moved. -CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/src/vendor" -do_install () { - install -d "${D}${bindir}" - install -m 755 "${RUSTSRC}/src/target/${CARGO_TARGET_SUBDIR}/cargo" "${D}${bindir}" -} diff --git a/recipes-devtools/cargo/cargo_1.33.0.bb b/recipes-devtools/cargo/cargo_1.33.0.bb new file mode 100644 index 0000000..dd050a8 --- /dev/null +++ b/recipes-devtools/cargo/cargo_1.33.0.bb @@ -0,0 +1,3 @@ +require recipes-devtools/rust/rust-source-${PV}.inc +require recipes-devtools/rust/rust-snapshot-${PV}.inc +require cargo.inc diff --git a/recipes-devtools/rust/libstd-rs_1.31.1.bb b/recipes-devtools/rust/libstd-rs_1.31.1.bb deleted file mode 100644 index 561f4d5..0000000 --- a/recipes-devtools/rust/libstd-rs_1.31.1.bb +++ /dev/null @@ -1,8 +0,0 @@ -require rust-source-${PV}.inc -require libstd-rs.inc - -LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=66ddc8ecd998476b7cd5732e8c3a6c1d" - -CARGO_FEATURES ?= "panic-unwind" - -CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/src/vendor" diff --git a/recipes-devtools/rust/libstd-rs_1.33.0.bb b/recipes-devtools/rust/libstd-rs_1.33.0.bb new file mode 100644 index 0000000..299a834 --- /dev/null +++ b/recipes-devtools/rust/libstd-rs_1.33.0.bb @@ -0,0 +1,8 @@ +require rust-source-${PV}.inc +require libstd-rs.inc + +LIC_FILES_CHKSUM = "file://../../COPYRIGHT;md5=27e0aaa5e5cbd279af456711d3bdc066" + +CARGO_FEATURES ?= "panic-unwind backtrace" + +CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" diff --git a/recipes-devtools/rust/rust-cross_1.31.1.bb b/recipes-devtools/rust/rust-cross_1.33.0.bb similarity index 100% rename from recipes-devtools/rust/rust-cross_1.31.1.bb rename to recipes-devtools/rust/rust-cross_1.33.0.bb diff --git a/recipes-devtools/rust/rust-llvm_1.31.1.bb b/recipes-devtools/rust/rust-llvm_1.33.0.bb similarity index 100% rename from recipes-devtools/rust/rust-llvm_1.31.1.bb rename to recipes-devtools/rust/rust-llvm_1.33.0.bb diff --git a/recipes-devtools/rust/rust-snapshot-1.31.1.inc b/recipes-devtools/rust/rust-snapshot-1.33.0.inc similarity index 59% rename from recipes-devtools/rust/rust-snapshot-1.31.1.inc rename to recipes-devtools/rust/rust-snapshot-1.33.0.inc index df7f8df..08be825 100644 --- a/recipes-devtools/rust/rust-snapshot-1.31.1.inc +++ b/recipes-devtools/rust/rust-snapshot-1.33.0.inc @@ -1,14 +1,12 @@ -# Specifics for Rust 1.31.1 - ## 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.30.0" +RS_VERSION = "1.32.0" RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu" RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu" -CARGO_VERSION = "0.31.0" +CARGO_VERSION = "0.33.0" CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu" SRC_URI += " \ @@ -18,9 +16,9 @@ SRC_URI += " \ " # TODO: Add hashes for other architecture toolchains as well. Make a script? -SRC_URI[rustc-snapshot-x86_64.md5sum] = "262fe55e3261ecf601d3a434afdc6832" -SRC_URI[rustc-snapshot-x86_64.sha256sum] = "cc45058e9963d33ca28220e752d9e360b7e05f17e34284f5f8197738c3a88444" -SRC_URI[rust-std-snapshot-x86_64.md5sum] = "0e8831c2b916b2391734a3f46dd586b0" -SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "8514eedc0ed99ab75c61be3137c3e57c4115063ddc07aec842f687ebfc7ceda3" -SRC_URI[cargo-snapshot-x86_64.md5sum] = "bad665c07e73a3f3cfa7ec3b209737fc" -SRC_URI[cargo-snapshot-x86_64.sha256sum] = "bfbabba9a2c1717fe1ce68469ce2de7b4b94e44e6a165d50b77de7bf7515bdb6" +SRC_URI[rustc-snapshot-x86_64.md5sum] = "e8d74f3043fb0b566f6af0110a73af7f" +SRC_URI[rustc-snapshot-x86_64.sha256sum] = "75c31f32e19548c1608611d08b82b87560e02f15caac7b2663a8189a4609977c" +SRC_URI[rust-std-snapshot-x86_64.md5sum] = "5e644ee49ce9ce449824f9f0a4153409" +SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "9f2705a3ed3217c13fd55569406c52f590030752f57520312e135223ae930caf" +SRC_URI[cargo-snapshot-x86_64.md5sum] = "13fbd6575ff9e5d865127bf0bff3b51d" +SRC_URI[cargo-snapshot-x86_64.sha256sum] = "9dd7f79a0ab882ed7c892731514a4aed6435f7bc8a20381a8346b471c8a14209" diff --git a/recipes-devtools/rust/rust-source-1.31.1.inc b/recipes-devtools/rust/rust-source-1.31.1.inc deleted file mode 100644 index aa057e8..0000000 --- a/recipes-devtools/rust/rust-source-1.31.1.inc +++ /dev/null @@ -1,15 +0,0 @@ -# Specifics for Rust 1.31.1 - -SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust" - -SRC_URI[md5sum] = "f6ef68a5cf5c420943228750e33b691a" -SRC_URI[sha256sum] = "91d2fc22f08d986adab7a54eb3a6a9b99e490f677d2d092e5b9e4e069c23686a" -SRC_URI[rust.md5sum] = "f6ef68a5cf5c420943228750e33b691a" -SRC_URI[rust.sha256sum] = "91d2fc22f08d986adab7a54eb3a6a9b99e490f677d2d092e5b9e4e069c23686a" - -# later versions of rust change the directory that they unextract to -RUSTSRC = "${WORKDIR}/rustc-${PV}-src" -# set this as our default -S = "${RUSTSRC}" - -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=66ddc8ecd998476b7cd5732e8c3a6c1d" diff --git a/recipes-devtools/rust/rust-source-1.33.0.inc b/recipes-devtools/rust/rust-source-1.33.0.inc new file mode 100644 index 0000000..d18454a --- /dev/null +++ b/recipes-devtools/rust/rust-source-1.33.0.inc @@ -0,0 +1,11 @@ +SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust" + +SRC_URI[rust.md5sum] = "54b688b5bc328ae72d8bfcf218969cea" +SRC_URI[rust.sha256sum] = "5a01a8d7e65126f6079042831385e77485fa5c014bf217e9f3e4aff36a485d94" + +# later versions of rust change the directory that they unextract to +RUSTSRC = "${WORKDIR}/rustc-${PV}-src" +# set this as our default +S = "${RUSTSRC}" + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=27e0aaa5e5cbd279af456711d3bdc066" diff --git a/recipes-devtools/rust/rust_1.31.1.bb b/recipes-devtools/rust/rust_1.33.0.bb similarity index 100% rename from recipes-devtools/rust/rust_1.31.1.bb rename to recipes-devtools/rust/rust_1.33.0.bb