From a5a8904f8c8d81059ba79fd84d3a808462c86065 Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Wed, 28 Dec 2022 15:23:31 +0000 Subject: [PATCH] cargo: Include crossbeam-utils patch We need patched crossbeam-utils in cargo as well as rust, move cargo alongside rust so they can both use the same patch. (From OE-Core rev: 39402790724014a39b265ee1978396a0514fdc98) Signed-off-by: Alex Kiernan Signed-off-by: Richard Purdie --- meta/recipes-devtools/{cargo => rust}/cargo_1.66.0.bb | 9 +++++++-- .../rust/{rust => files}/crossbeam_atomic.patch | 0 2 files changed, 7 insertions(+), 2 deletions(-) rename meta/recipes-devtools/{cargo => rust}/cargo_1.66.0.bb (93%) rename meta/recipes-devtools/rust/{rust => files}/crossbeam_atomic.patch (100%) diff --git a/meta/recipes-devtools/cargo/cargo_1.66.0.bb b/meta/recipes-devtools/rust/cargo_1.66.0.bb similarity index 93% rename from meta/recipes-devtools/cargo/cargo_1.66.0.bb rename to meta/recipes-devtools/rust/cargo_1.66.0.bb index fe8049b68c..f00c67bef5 100644 --- a/meta/recipes-devtools/cargo/cargo_1.66.0.bb +++ b/meta/recipes-devtools/rust/cargo_1.66.0.bb @@ -11,8 +11,13 @@ LIC_FILES_CHKSUM = " \ file://LICENSE-THIRD-PARTY;md5=f257ad009884cb88a3a87d6920e7180a \ " -require recipes-devtools/rust/rust-source.inc -require recipes-devtools/rust/rust-snapshot.inc +require rust-source.inc +require rust-snapshot.inc + +SRC_URI:append:class-target = " file://crossbeam_atomic.patch;patchdir=${RUSTSRC}" + +# Used by crossbeam_atomic.patch +export TARGET_VENDOR S = "${RUSTSRC}/src/tools/cargo" CARGO_VENDORING_DIRECTORY = "${RUSTSRC}/vendor" diff --git a/meta/recipes-devtools/rust/rust/crossbeam_atomic.patch b/meta/recipes-devtools/rust/files/crossbeam_atomic.patch similarity index 100% rename from meta/recipes-devtools/rust/rust/crossbeam_atomic.patch rename to meta/recipes-devtools/rust/files/crossbeam_atomic.patch