From 6f39c76f60d5899f1d79fea5f14e415a90ab9485 Mon Sep 17 00:00:00 2001 From: Yash Shinde Date: Wed, 25 Jun 2025 03:20:12 -0700 Subject: [PATCH] rust: Drop obsolete rust-lld and extended tools dependencies Some dependencies introduced during the v1.86 upgrade were needed only for rust-lld and certain LLVM extended tools, not for the Rust compiler itself. Since rust-lld and the extended tools are now disabled, these dependencies have become obsolete. Additionally, related tasks such as packaging zsh files and removing cargo binaries are no longer relevant. They can be re-enabled later if needed. (From OE-Core rev: 42141da566c9512b338900967e7e81e9e8b49150) Signed-off-by: Yash Shinde Signed-off-by: Richard Purdie --- meta/recipes-devtools/rust/rust_1.86.0.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/rust/rust_1.86.0.bb b/meta/recipes-devtools/rust/rust_1.86.0.bb index c2443fbb15..b13ec116be 100644 --- a/meta/recipes-devtools/rust/rust_1.86.0.bb +++ b/meta/recipes-devtools/rust/rust_1.86.0.bb @@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=11a3899825f4376896e438c8c753f8dc" inherit rust inherit cargo_common -DEPENDS += "rust-llvm pkgconfig-native openssl ninja-native" +DEPENDS += "rust-llvm" # native rust uses cargo/rustc from binary snapshots to bootstrap # but everything else should use our native builds DEPENDS:append:class-target = " cargo-native rust-native" DEPENDS:append:class-nativesdk = " cargo-native rust-native" -RDEPENDS:${PN}:append:class-target = " gcc g++ binutils bash" +RDEPENDS:${PN}:append:class-target = " gcc g++ binutils" # Otherwise we'll depend on what we provide INHIBIT_DEFAULT_RUST_DEPS:class-native = "1" @@ -237,11 +237,10 @@ do_test_compile () { ALLOW_EMPTY:${PN} = "1" -PACKAGES =+ "${PN}-rustdoc ${PN}-tools-clippy ${PN}-tools-rustfmt ${PN}-zsh-completion" +PACKAGES =+ "${PN}-rustdoc ${PN}-tools-clippy ${PN}-tools-rustfmt" FILES:${PN}-rustdoc = "${bindir}/rustdoc" FILES:${PN}-tools-clippy = "${bindir}/cargo-clippy ${bindir}/clippy-driver" FILES:${PN}-tools-rustfmt = "${bindir}/rustfmt" -FILES:${PN}-zsh-completion = "${datadir}/zsh" RDEPENDS:${PN}-rustdoc = "${PN}" RDEPENDS:${PN}-tools-clippy = "${PN}" @@ -258,10 +257,6 @@ rust_do_install() { rust_runx install } -rust_do_install:append:class-native () { - rm -f ${D}${bindir}/cargo -} - rust_do_install:class-nativesdk() { export PSEUDO_UNLOAD=1 rust_runx install