Skip to contentSkip to conversation

rust-cross-canadian: Fix file conflicts for arm and aarch64

PATCH Superseded [email protected] 2 participants 3 messages Nov 8, 2023 – Nov 30, 2023

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 rust-cross-canadian: Fix file conflicts for arm and aarch64

From: Deepthi Hemraj <[email protected]>

[YOCTO #15061]
Rust multilib sdks broken because of the conflicts between attempted installs of rust-cross-canadian for arm and aarch64.

Arm and aarch64 target architectures are trying to install cargo.sh and rust.sh in the same path which resulted in the issue.

The current patch modifies CARGO_ENV_SETUP_SH and RUST_ENV_SETUP_SH macros based on the architecture. Hence, creates different file names for the environment setup scripts and resolves the issue.

---
 .../rust/rust-cross-canadian.inc              | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)
meta/recipes-devtools/rust/rust-cross-canadian.inc +24 -1
index 7bfef6d175..9efc2389bb 100644
@@ -54,6 +54,18 @@ do_install () {
     mkdir "${ENV_SETUP_DIR}"
     RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust.sh"
 
+    # Set up environment variables for AArch64
+    if [ "${TARGET_ARCH}" = "aarch64" ]; then
+	RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust-aarch64.sh"
+	RUST_TARGET_SYS="aarch64-unknown-linux-gnu"
+    # Set up environment variables for ARM
+    elif [ "${TARGET_ARCH}" = "arm" ]; then
+	RUST_ENV_SETUP_SH="${ENV_SETUP_DIR}/rust-arm.sh"
+	RUST_TARGET_SYS="arm-unknown-linux-gnueabi"
+    else
+	echo "Unsupported TARGET_ARCH: ${TARGET_ARCH}"
+    fi
+
     RUST_TARGET_TRIPLE=`echo ${RUST_TARGET_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'`
     RUST_HOST_TRIPLE=`echo ${RUST_HOST_SYS} | tr '[:lower:]' '[:upper:]' | sed 's/-/_/g'`
     SDKLOADER=${@bb.utils.contains('SDK_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'i686', 'ld-linux.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'aarch64', 'ld-linux-aarch64.so.1', '', d)}${@bb.utils.contains('SDK_ARCH', 'ppc64le', 'ld64.so.2', '', d)}${@bb.utils.contains('SDK_ARCH', 'riscv64', 'ld-linux-riscv64-lp64d.so.1', '', d)}
@@ -65,8 +77,19 @@ do_install () {
 	EOF
 
     chown -R root.root ${D}
-
     CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo.sh"
+
+    # Set up environment variables for AArch64
+    if [ "${TARGET_ARCH}" = "aarch64" ]; then
+	CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo-aarch64.sh"
+	CARGO_TARGET_SYS="aarch64-unknown-linux-gnu"
+    elif [ "${TARGET_ARCH}" = "arm" ]; then
+	CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo-arm.sh"
+	CARGO_TARGET_SYS="arm-unknown-linux-gnueabi"
+    else
+	echo "Unsupported TARGET_ARCH: ${TARGET_ARCH}"
+    fi
+
     cat <<- EOF > "${CARGO_ENV_SETUP_SH}"
 	export CARGO_HOME="\$OECORE_TARGET_SYSROOT/home/cargo"
 	mkdir -p "\$CARGO_HOME"
Signature · 1 line
2.42.0
#1 lore raw

meta/recipes-devtools/rust/rust-cross-canadian.inc do_install () { · line 91

Quoted 10 lines · Deepthi via lists.openembedded.org
meta/recipes-devtools/rust/rust-cross-canadian.inc +10 -0
+    # Set up environment variables for AArch64
+    if [ "${TARGET_ARCH}" = "aarch64" ]; then
+ CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo-aarch64.sh"
+ CARGO_TARGET_SYS="aarch64-unknown-linux-gnu"
+    elif [ "${TARGET_ARCH}" = "arm" ]; then
+ CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo-arm.sh"
+ CARGO_TARGET_SYS="arm-unknown-linux-gnueabi"
+    else
+ echo "Unsupported TARGET_ARCH: ${TARGET_ARCH}"
+    fi

Why does this restrict rust-cross-canadian to arm/aarch64? x86-64 isn’t unsupported and presumably a x86/x86-64 multilib setup will fail the same way?

Ross

#2 lore raw

Hi Ross,

Thanks for reviewing the patch and your suggestion.

Quoted 1 line
Quoted 1 line

Why does this restrict rust-cross-canadian to arm/aarch64?

Please find the patch at following link that fixes the conflicts for arm64 and x86-64.
https://lists.openembedded.org/g/openembedded-core/message/191481

Thanks,
Deepthi
From: Ross Burton<mailto:[email protected]>
Sent: Thursday, November 23, 2023 6:10 PM
To: Hemraj, Deepthi<mailto:[email protected]>
Cc: OE Core mailing list<mailto:[email protected]>; MacLeod, Randy<mailto:[email protected]>; Gowda, Naveen<mailto:[email protected]>; Moodalappa, Shivaprasad<mailto:[email protected]>; Kokkonda, Sundeep<mailto:[email protected]>; Khem Raj<mailto:[email protected]>
Subject: Re: [OE-core] [PATCH V2] rust-cross-canadian: Fix file conflicts for arm and aarch64

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.

meta/recipes-devtools/rust/rust-cross-canadian.inc do_install () { · line 91

Quoted 10 lines · Deepthi via lists.openembedded.org
meta/recipes-devtools/rust/rust-cross-canadian.inc +10 -0
+    # Set up environment variables for AArch64
+    if [ "${TARGET_ARCH}" = "aarch64" ]; then
+ CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo-aarch64.sh"
+ CARGO_TARGET_SYS="aarch64-unknown-linux-gnu"
+    elif [ "${TARGET_ARCH}" = "arm" ]; then
+ CARGO_ENV_SETUP_SH="${ENV_SETUP_DIR}/cargo-arm.sh"
+ CARGO_TARGET_SYS="arm-unknown-linux-gnueabi"
+    else
+ echo "Unsupported TARGET_ARCH: ${TARGET_ARCH}"
+    fi

Why does this restrict rust-cross-canadian to arm/aarch64? x86-64 isn’t unsupported and presumably a x86/x86-64 multilib setup will fail the same way?

Ross