Re: [OE-core] [PATCH V2 1/2] rust: fix for rust multilib sdk configuration

[Esben Haabendal <esben@geanix.com>]

"Sadineni, Harish via lists.openembedded.org"
<Harish.Sadineni=windriver.com@lists.openembedded.org> writes:

> From: Harish Sadineni <Harish.Sadineni@windriver.com>
>
> YOCTO [#15061]
> The rust sdk installs both 'rust.sh' and 'cargo.sh' for lib32 and lib64 in the same location.
> This causes below error while installing the lib32 & lib64 binaries:
>
> Error: Transaction test error:
>   file /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/environment-setup.d/cargo.sh
> conflicts between attempted installs of rust-cross-canadian-arm-1.67.1-r0.x86_64_nativesdk and
>  rust-cross-canadian-aarch64-1.67.1-r0.x86_64_nativesdk
>   file /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/environment-setup.d/rust.sh
> conflicts between attempted installs of rust-cross-canadian-arm-1.67.1-r0.x86_64_nativesdk and
> rust-cross-canadian-aarch64-1.67.1-r0.x86_64_nativesdk
> ERROR: Task (virtual:multilib:lib32:/media/build/poky/meta/recipes-sato/images/core-image-sato.bb:do_populate_sdk)
> failed with exit code '1'
>
> The change includes:
> - Prepending '${RUST_TARGET_SYS}' to 'rust.sh' to differentiate between target systems.
> - Moving the non-target-specific environment variables to 'nativesdk-cargo' and 'nativesdk-rust',
> instead of being managed by the cross-canadian recipe.
> - Removed the redundant cargo config file from the 'rust-cross-canadian.inc' file.
>
> Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
> ---
>  meta/recipes-devtools/rust/cargo_1.81.0.bb    | 15 +++++++++++
>  .../rust/rust-cross-canadian.inc              | 27 ++-----------------
>  meta/recipes-devtools/rust/rust_1.81.0.bb     | 13 +++++++++
>  3 files changed, 30 insertions(+), 25 deletions(-)
>
> diff --git a/meta/recipes-devtools/rust/cargo_1.81.0.bb b/meta/recipes-devtools/rust/cargo_1.81.0.bb
> index 123032cdf7..d05b076d30 100644
> --- a/meta/recipes-devtools/rust/cargo_1.81.0.bb
> +++ b/meta/recipes-devtools/rust/cargo_1.81.0.bb
> @@ -50,8 +50,23 @@ do_install:append:class-nativesdk() {
>  	# sets to libdir but not base_libdir leading to symbol mismatches depending on the
>  	# host OS. Fully set LD_LIBRARY_PATH to contain both to avoid this.
>  	create_wrapper ${D}/${bindir}/cargo LD_LIBRARY_PATH=${libdir}:${base_libdir}
> +
> +        ENV_SETUP_DIR=${D}${base_prefix}/environment-setup.d
> +        mkdir "${ENV_SETUP_DIR}"
> +        CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh"
> +
> +        cat <<- EOF > "${CARGO_ENV_SETUP_SH}"
> +	# Keep the below off as long as HTTP/2 is disabled.
> +	export CARGO_HTTP_MULTIPLEXING=false
> +
> +	export CARGO_HTTP_CAINFO="\$OECORE_NATIVE_SYSROOT/etc/ssl/certs/ca-certificates.crt"
> +	EOF
> +
> +        chown -R root.root ${D}

You should probably cleanup the mixed use of tabs and spaces above.

/Esben