diff mbox series

[1/3] rust: Drop obsolete rust-lld and extended tools dependencies

Message ID 20250624091403.2469860-1-Yash.Shinde@windriver.com
State New
Headers show
Series [1/3] rust: Drop obsolete rust-lld and extended tools dependencies | expand

Commit Message

Yash Shinde June 24, 2025, 9:14 a.m. UTC 
From: Yash Shinde <Yash.Shinde@windriver.com>

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.

Signed-off-by: Yash Shinde <Yash.Shinde@windriver.com>
---
 meta/recipes-devtools/rust/rust_1.86.0.bb | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Comments

Randy MacLeod June 24, 2025, 4:13 p.m. UTC | #1 
On 2025-06-24 5:14 a.m., Yash.Shinde@windriver.com wrote:
> From: Yash Shinde<Yash.Shinde@windriver.com>
>
> 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.

Why drop the zsh packaging? Did it get removed upstream?

Same question about why it's safe to drop the rm -rf cargo.

../Randy


>
> Signed-off-by: Yash Shinde<Yash.Shinde@windriver.com>
> ---
>   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
Yash Shinde June 25, 2025, 10:26 a.m. UTC | #2 
On 24-06-2025 21:43, Randy MacLeod wrote:
> On 2025-06-24 5:14 a.m., Yash.Shinde@windriver.com wrote:
>> From: Yash Shinde<Yash.Shinde@windriver.com>
>>
>> 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.
>
> Why drop the zsh packaging? Did it get removed upstream?
>
> Same question about why it's safe to drop the rm -rf cargo.
>
These changes were initially made due to dependency requirements for 
building
rust-lld and the extended tools. However, after disabling rust-lld and 
the extended tools
and reviewing the dependencies, it was found that these changes were no 
longer necessary.


Regards,
Yash

> ../Randy
>
>
>> Signed-off-by: Yash Shinde<Yash.Shinde@windriver.com>
>> ---
>>   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
>
>
> -- 
> # Randy MacLeod
> # Wind River Linux
diff mbox series

Patch

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