Skip to contentSkip to conversation

Fix Bug-14613

PATCH In review Pgowda 2 participants 3 messages Nov 15, 2021

lore
Share & tools
lore

Pgowda

author
#0 lore raw

PATCH 1/1 Fix Bug-14613

Source:- https://bugzilla.yoctoproject.org/show_bug.cgi?id=14613

Adds TUNE_PKGARCH to PN so that it picks correct TUNE_FEATURES.

---
 meta/recipes-devtools/rust/rust-cross.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/rust/rust-cross.inc +1 -1
index bb625f4240..30c92ed395 100644
@@ -34,7 +34,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs vir
 DEPENDS += "rust-native"
 
 PROVIDES = "virtual/${TARGET_PREFIX}rust"
-PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}"
+PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}-${TUNE_PKGARCH}"
 
 # In the cross compilation case, rustc doesn't seem to get the rpath quite
 # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't
Signature · 1 line
2.31.1
#1 lore raw
Quoted 14 lines · Pgowda

Source:- https://bugzilla.yoctoproject.org/show_bug.cgi?id=14613

Adds TUNE_PKGARCH to PN so that it picks correct TUNE_FEATURES.

---
 meta/recipes-devtools/rust/rust-cross.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/rust/rust-cross.inc +0 -0
index bb625f4240..30c92ed395 100644

meta/recipes-devtools/rust/rust-cross.inc DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs vir · line 40

Quoted 8 lines
meta/recipes-devtools/rust/rust-cross.inc +1 -1
@@ -34,7 +34,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs vir
 DEPENDS += "rust-native"
 
 PROVIDES = "virtual/${TARGET_PREFIX}rust"
-PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}"
+PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}-${TUNE_PKGARCH}"
 
 # In the cross compilation case, rustc doesn't seem to get the rpath quite
 # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't

If we do this we can drop the TARGET_ARCH piece since that isn't needed with the more specific tune present.

Cheers,

Richard

#2 lore raw
In reply to Pgowda
Quoted 4 lines · Pgowda

Source:- https://bugzilla.yoctoproject.org/show_bug.cgi?id=14613

Adds TUNE_PKGARCH to PN so that it picks correct TUNE_FEATURES.

Also, the short log needs to be in the format matching our commit guidelines so something like:

rust-cross: Replace TARGET_ARCH with TUNE_PKGARCH

and then the full log needs to describe what issues there were, why the commit is necessary and how this fixes it. It should be readable without looking at the bugzilla entry.

The format for a link to the bugzilla entry is:

[YOCTO #14613]

Cheers,

Richard