[PATCH v2 1/5] Revert "rust: remove redundant cargo config file"

[PATCH v2 1/5] Revert "rust: remove redundant cargo config file"

[Harish.Sadineni]

From: Harish Sadineni <Harish.Sadineni@windriver.com>

The 'cargo build' is supposed to build binary for the target but it is
building for Host.
Reverting below commit to make 'cargo build' to built for target as
default in sdk
commit# 37fea972a6fafe360bfbb2d1ac472fa9e060c733.

Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
---
 meta/recipes-devtools/rust/rust-cross-canadian.inc | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index df8b78d326..fcfd178f34 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
@@ -64,6 +64,20 @@ do_install () {
 
     chown -R root.root ${D}
 
+    CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh"
+    cat <<- EOF > "${CARGO_ENV_SETUP_SH}"
+	export CARGO_HOME="\$OECORE_TARGET_SYSROOT/home/cargo"
+	mkdir -p "\$CARGO_HOME"
+        # Init the default target once, it might be otherwise user modified.
+	if [ ! -f "\$CARGO_HOME/config" ]; then
+		touch "\$CARGO_HOME/config"
+		echo "[build]" >> "\$CARGO_HOME/config"
+		echo 'target = "'${RUST_TARGET_SYS}'"' >> "\$CARGO_HOME/config"
+		echo '# TARGET_SYS' >> "\$CARGO_HOME/config"
+		echo '[target.'${RUST_TARGET_SYS}']' >> "\$CARGO_HOME/config"
+		echo 'linker = "target-rust-ccld"' >> "\$CARGO_HOME/config"
+    fi
+	EOF
 }
 
 FILES:${PN} += "${base_prefix}/environment-setup.d"
-- 
2.49.0

[PATCH v2 2/5] toolchain-scripts.bbclass: Support target-specific environment setup scripts

[Harish.Sadineni]

From: Harish Sadineni <Harish.Sadineni@windriver.com>

YOCTO [#15061]
Extending the SDK environment setup logic to also source scripts from a
target-specific directory `${TARGET_SYS}_environment-setup.d`, if it exists.

And also printing the what all scripts were sourced when we source
enviroment in sdk

Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
---
 meta/classes-recipe/toolchain-scripts.bbclass | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/classes-recipe/toolchain-scripts.bbclass b/meta/classes-recipe/toolchain-scripts.bbclass
index 5d28df845b..c6f7faea81 100644
--- a/meta/classes-recipe/toolchain-scripts.bbclass
+++ b/meta/classes-recipe/toolchain-scripts.bbclass
@@ -163,14 +163,22 @@ toolchain_shared_env_script () {
 # Append environment subscripts
 if [ -d "\$OECORE_TARGET_SYSROOT/environment-setup.d" ]; then
     for envfile in \$OECORE_TARGET_SYSROOT/environment-setup.d/*.sh; do
+	    echo "Sourcing target env file: \$(basename "\$envfile")"
 	    . \$envfile
     done
 fi
 if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then
     for envfile in \$OECORE_NATIVE_SYSROOT/environment-setup.d/*.sh; do
+	    echo "Sourcing target env file: \$(basename "\$envfile")"
 	    . \$envfile
     done
 fi
+if [ -d "\$OECORE_NATIVE_SYSROOT/${TARGET_SYS}_environment-setup.d" ]; then
+    for envfile in \$OECORE_NATIVE_SYSROOT/${TARGET_SYS}_environment-setup.d/*.sh; do
+	    echo "Sourcing target env file: \$(basename "\$envfile")"
+            . \$envfile
+    done
+fi
 EOF
 }
 
-- 
2.49.0

[PATCH v2 3/5] rust-cross-canadian: Add target-specific environment setup support

[Harish.Sadineni]

From: Harish Sadineni <Harish.Sadineni@windriver.com>

YOCTO [#15061]
This change introduces support for target-specific environment setup scripts
by placing Rust-related environment initialization files into a separate
`${TARGET_SYS}_environment-setup.d` directory.

Changes include:
- `rust-cross-canadian.inc`: Adjust installation of Rust and Cargo setup scripts to use
  the target-specific environment setup directory `${TARGET_SYS}_environment-setup.d`.
- Ensure `CARGO_HOME` is target-specific to avoid conflicts when using multilib.
- Updated `FILES` path accordingly to ensure correct packaging.
- To resolve the following error when running cargo build for a lib32 target when multilib enabled,
  the RustFlags should include:
  "-L\$OECORE_TARGET_SYSROOT/usr/\${LIBDIR}/rustlib/${RUST_TARGET_SYS}/lib".

error[E0463]: can't find crate for `std`
  |
  = note: the `i686-pokymllib32-linux-gnu` target may not be installed
  = help: consider downloading the target with `rustup target add i686-pokymllib32-linux-gnu`

Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
---
 .../rust/rust-cross-canadian.inc                | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index fcfd178f34..87373bcb7f 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
@@ -51,22 +51,29 @@ do_install () {
     chmod +x "$outfile"
     create_sdk_wrapper "${SYS_BINDIR}/target-rust-ccld-wrapper" "CC"
 
-    ENV_SETUP_DIR=${D}${base_prefix}/environment-setup.d
+    ENV_SETUP_DIR=${D}${base_prefix}/${TARGET_SYS}_environment-setup.d
     mkdir "${ENV_SETUP_DIR}"
     RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/${RUST_TARGET_SYS}_rust.sh"
 
     RUST_TARGET_TRIPLE=`echo ${RUST_TARGET_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'`
 
     cat <<- EOF > "${RUST_ENV_SETUP_SH}"
-	export CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr -C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT"
+	export RUST_TARGET_SYS_VALUE="${RUST_TARGET_SYS}"
+	if echo "\$RUST_TARGET_SYS_VALUE" | grep -qE '(32)'; then
+	    LIBDIR="lib"    # For 32-bit targets
+	else
+	    LIBDIR="lib64"  # For 64-bit targets
+	fi
+	LIB_PATH="\$OECORE_TARGET_SYSROOT/usr/\${LIBDIR}/rustlib/${RUST_TARGET_SYS}/lib"
+	export CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr -C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT -L \$LIB_PATH"
 	export RUST_TARGET_PATH="\$OECORE_NATIVE_SYSROOT/usr/lib/${TARGET_SYS}/rustlib"
 	EOF
 
     chown -R root.root ${D}
 
-    CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh"
+    CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/${RUST_TARGET_SYS}_cargo.sh"
     cat <<- EOF > "${CARGO_ENV_SETUP_SH}"
-	export CARGO_HOME="\$OECORE_TARGET_SYSROOT/home/cargo"
+	export CARGO_HOME="\$OECORE_TARGET_SYSROOT/home/cargo/${RUST_TARGET_SYS}"
 	mkdir -p "\$CARGO_HOME"
         # Init the default target once, it might be otherwise user modified.
 	if [ ! -f "\$CARGO_HOME/config" ]; then
@@ -80,5 +87,5 @@ do_install () {
 	EOF
 }
 
-FILES:${PN} += "${base_prefix}/environment-setup.d"
+FILES:${PN} += "${base_prefix}/${TARGET_SYS}_environment-setup.d"
 
-- 
2.49.0

[PATCH v2 4/5] oeqa/sdk/cases/rust.py: Add test to verify cargo build builds for target

[Harish.Sadineni]

From: Harish Sadineni <Harish.Sadineni@windriver.com>

Ensure that cargo build successfully builds the binary for the target by default.
This test validates whether the default build process produces the expected output
for the specified target.

Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
---
 meta/lib/oeqa/sdk/cases/rust.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/meta/lib/oeqa/sdk/cases/rust.py b/meta/lib/oeqa/sdk/cases/rust.py
index 4b115bebf5..17908f21f5 100644
--- a/meta/lib/oeqa/sdk/cases/rust.py
+++ b/meta/lib/oeqa/sdk/cases/rust.py
@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
+import json
 import os
 import shutil
 import unittest
@@ -33,6 +34,21 @@ class RustCompileTest(OESDKTestCase):
     def test_cargo_build(self):
         self._run('cd %s/hello; cargo add zstd' % (self.tc.sdk_dir))
         self._run('cd %s/hello; cargo build' % self.tc.sdk_dir)
+    def test_check_cargo_build_default_target(self):
+        result_env = self._run("echo $RUST_TARGET_SYS_VALUE")
+        rust_target_sys = result_env.strip()
+        result = self._run("cd %s/hello; cargo build --message-format=json | jq -rc 'select(.executable != null) | .executable'" % (self.tc.sdk_dir))
+        lines = result.strip().splitlines()
+        last_path = lines[-1]
+        parts = last_path.split(os.sep)
+        target_index = parts.index("target")
+        target_triple = parts[target_index + 1]
+
+        self.assertEqual(
+            rust_target_sys,
+            target_triple,
+            f"Target triple mismatch: env '{rust_target_sys}' != path '{target_triple}'"
+        )
 
 class RustHostCompileTest(OESDKTestCase):
     td_vars = ['MACHINE', 'SDK_SYS']
-- 
2.49.0

[PATCH v2 5/5] rust-cross-canadian: fix cargo run failure for target in sdk

[Harish.Sadineni]

From: Harish Sadineni <Harish.Sadineni@windriver.com>

In sdk while running "cargo run --target <target-name>" command
fails due to follwing errors:

for x86_64:
target/x86_64-poky-linux-gnu/debug/hell: symbol lookup error: /poky/build/tmp/
deploy/sdk/sdk/sysroots/x86_64-pokysdk-linux/usr/bin/../../lib/libc.so.6:
undefined symbol: __tunable_is_initialized, version GLIBC_PRIVATE

for arm64:
qemu-aarch64-static: Could not open '/lib/ld-linux-aarch64.so.1': No such file
or directory

This chnage fixes cargo run failure for target in sdk

Signed-off-by: Harish Sadineni <Harish.Sadineni@windriver.com>
---
 meta/recipes-devtools/rust/rust-cross-canadian.inc | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/meta/recipes-devtools/rust/rust-cross-canadian.inc b/meta/recipes-devtools/rust/rust-cross-canadian.inc
index 87373bcb7f..200ab7eff6 100644
--- a/meta/recipes-devtools/rust/rust-cross-canadian.inc
+++ b/meta/recipes-devtools/rust/rust-cross-canadian.inc
@@ -59,6 +59,15 @@ do_install () {
 
     cat <<- EOF > "${RUST_ENV_SETUP_SH}"
 	export RUST_TARGET_SYS_VALUE="${RUST_TARGET_SYS}"
+	case "\${RUST_TARGET_SYS_VALUE}" in
+	*x86_64*)   SDKLOADER="ld-linux-x86-64.so.2" ;;
+	*i686*)     SDKLOADER="ld-linux.so.2" ;;
+	*aarch64*)  SDKLOADER="ld-linux-aarch64.so.1" ;;
+	*arm*)      SDKLOADER="ld-linux-armhf.so.3" ;;
+	*ppc64le*)  SDKLOADER="ld64.so.2" ;;
+	*riscv64*)  SDKLOADER="ld-linux-riscv64-lp64d.so.1" ;;
+	*)          SDKLOADER="" ;;
+	esac
 	if echo "\$RUST_TARGET_SYS_VALUE" | grep -qE '(32)'; then
 	    LIBDIR="lib"    # For 32-bit targets
 	else
@@ -67,6 +76,7 @@ do_install () {
 	LIB_PATH="\$OECORE_TARGET_SYSROOT/usr/\${LIBDIR}/rustlib/${RUST_TARGET_SYS}/lib"
 	export CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUSTFLAGS="--sysroot=\$OECORE_TARGET_SYSROOT/usr -C link-arg=--sysroot=\$OECORE_TARGET_SYSROOT -L \$LIB_PATH"
 	export RUST_TARGET_PATH="\$OECORE_NATIVE_SYSROOT/usr/lib/${TARGET_SYS}/rustlib"
+	export CARGO_TARGET_${RUST_TARGET_TRIPLE}_RUNNER="\$OECORE_TARGET_SYSROOT/\${LIBDIR}/\${SDKLOADER} --library-path \$OECORE_TARGET_SYSROOT/\${LIBDIR}"
 	EOF
 
     chown -R root.root ${D}
-- 
2.49.0

Re: [OE-core] [PATCH v2 2/5] toolchain-scripts.bbclass: Support target-specific environment setup scripts

[Ross Burton]

On 15 Sep 2025, at 11:27, Sadineni, Harish via lists.openembedded.org <Harish.Sadineni=windriver.com@lists.openembedded.org> wrote:
> 
> From: Harish Sadineni <Harish.Sadineni@windriver.com>
> 
> YOCTO [#15061]
> Extending the SDK environment setup logic to also source scripts from a
> target-specific directory `${TARGET_SYS}_environment-setup.d`, if it exists.

> +if [ -d "\$OECORE_NATIVE_SYSROOT/${TARGET_SYS}_environment-setup.d" ]; then

We already have a target-specific directory already: populated by the target recipes.

The SDKs are constructed in two parts:

- The target recipes (eg libxml2) are used to build the target sysroot. In this case, the same package that provides /usr/lib/libxml2.so <http://libxml2.so/> on the target will be used in the target sysroot to link against.

- The nativesdk recipes (eg nativesdk-libxml2) are used to build the native sysroot (thus the name, native for the SDK).  So in this case, nativesdk-libxml2 will provide the xmllint binary in the SDK.

There should be _no_ connection between the target MACHINE and the nativesdk recipes, just like there is no connection between target and native. As the native sysroot is populated from nativesdk recipes, they shouldn’t be able to know what the final target actually is.

Where you have crossover there currently needs to be a little magic, for example the nativesdk-cmake recipe has an environment.d script that takes the target configuration from the environment variables and generates CMake configuration.

Ross

Re: [OE-core] [PATCH v2 4/5] oeqa/sdk/cases/rust.py: Add test to verify cargo build builds for target

[Ross Burton]

On 15 Sep 2025, at 11:27, Sadineni, Harish via lists.openembedded.org <Harish.Sadineni=windriver.com@lists.openembedded.org> wrote:
> +        result = self._run("cd %s/hello; cargo build --message-format=json | jq -rc 'select(.executable != null) | .executable'" % (self.tc.sdk_dir))

We don’t put jq into the SDKs, so you’re relying on it being installed on the host.

Instead, just output JSON and parse it in the test code.

Ross

Re: [OE-core] [PATCH v2 2/5] toolchain-scripts.bbclass: Support target-specific environment setup scripts

[Harish Sadineni]

On 9/18/2025 9:29 PM, Ross Burton wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On 15 Sep 2025, at 11:27, Sadineni, Harish via lists.openembedded.org <Harish.Sadineni=windriver.com@lists.openembedded.org> wrote:
>> From: Harish Sadineni <Harish.Sadineni@windriver.com>
>>
>> YOCTO [#15061]
>> Extending the SDK environment setup logic to also source scripts from a
>> target-specific directory `${TARGET_SYS}_environment-setup.d`, if it exists.
>> +if [ -d "\$OECORE_NATIVE_SYSROOT/${TARGET_SYS}_environment-setup.d" ]; then
> We already have a target-specific directory already: populated by the target recipes.
>
> The SDKs are constructed in two parts:
>
> - The target recipes (eg libxml2) are used to build the target sysroot. In this case, the same package that provides /usr/lib/libxml2.so <http://libxml2.so/> on the target will be used in the target sysroot to link against.
>
> - The nativesdk recipes (eg nativesdk-libxml2) are used to build the native sysroot (thus the name, native for the SDK).  So in this case, nativesdk-libxml2 will provide the xmllint binary in the SDK.
>
> There should be _no_ connection between the target MACHINE and the nativesdk recipes, just like there is no connection between target and native. As the native sysroot is populated from nativesdk recipes, they shouldn’t be able to know what the final target actually is.
>
> Where you have crossover there currently needs to be a little magic, for example the nativesdk-cmake recipe has an environment.d script that takes the target configuration from the environment variables and generates CMake configuration.
Hi Ross,

Thanks for clarification, we referred how nativesdk-cmake recipe has 
handling environment.d script(cmake.sh) it is Copying necessary files 
into the SDK without expanding any values at build time but with rust.sh 
and cargo.sh it will need to expand values at build time so we can't 
adopt that.

And from your comments, we understand that target-specific components 
should reside within the target sysroot, and only nativesdk components 
should be placed in the native sysroot.

Based on this, we're now moving our ${TARGET_SYS}_environment-setup.d 
directory to the target sysroot from native sysroot.

And now we observe the following target sysroots under sysroots 
directory when using multilib:
x86_64-pokysdk-linux
x86-64-v3-poky-linux
x86-pokymllib32-linux

Is this what you are referring to, is our understanding correct with 
this change?

Thanks,
Harish

>
> Ross