Skip to contentSkip to conversation

rust-cross: Replace TARGET_ARCH with TUNE_PKGARCH

PATCH In review Pgowda 4 participants 6 messages Nov 15, 2021 – Nov 18, 2021

lore
Share & tools
lore

Pgowda

author
#0 lore raw

PATCH v2 1/1 rust-cross: Replace TARGET_ARCH with TUNE_PKGARCH

rust-cross-* imported from meta-rust has incorrect signatures, depending on MACHINEOVERRIDES making it effectively MACHINE_ARCH as shown by sstate-diff-machines.sh:

openembedded-core/scripts/sstate-diff-machines.sh --tmpdir=tmp-glibc \
--machines="qemuarm64 qemuarm64copy" --targets=rust-cross-aarch64-glibc \
--analyze

=== Comparing signatures for task do_configure.sigdata between qemuarm64 and qemuarm64copy ===
ERROR: gcc-runtime different signature for task do_configure.sigdata between qemuarm64 and qemuarm64copy
NOTE: Starting bitbake server...
Hash for dependent task gcc/gcc-runtime_11.2.bb:do_prepare_recipe_sysroot changed from da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 to 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40 Unable to find matching sigdata for openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_11.2.bb:
do_prepare_recipe_sysroot with hashes da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 or 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40

The following patch takes TUNE_PKGARCH into consideration instead of TARGET_ARCH and results in signatures as expected.

[YOCTO #14613]

---
 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..a77f7d5122 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-${TUNE_PKGARCH}-${TCLIBC}"
 
 # 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 38 lines · Pgowda

rust-cross-* imported from meta-rust has incorrect signatures, depending on MACHINEOVERRIDES making it effectively MACHINE_ARCH as shown by sstate-diff-machines.sh:

openembedded-core/scripts/sstate-diff-machines.sh --tmpdir=tmp-glibc \
--machines="qemuarm64 qemuarm64copy" --targets=rust-cross-aarch64-glibc \
--analyze

=== Comparing signatures for task do_configure.sigdata between qemuarm64 and qemuarm64copy ===
ERROR: gcc-runtime different signature for task do_configure.sigdata between qemuarm64 and qemuarm64copy
NOTE: Starting bitbake server...
Hash for dependent task gcc/gcc-runtime_11.2.bb:do_prepare_recipe_sysroot changed from da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 to 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40 Unable to find matching sigdata for openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_11.2.bb:
do_prepare_recipe_sysroot with hashes da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 or 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40

The following patch takes TUNE_PKGARCH into consideration instead of TARGET_ARCH and results in signatures as expected.

[YOCTO #14613]

---
  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..a77f7d5122 100644

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

Quoted 5 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-${TUNE_PKGARCH}-${TCLIBC}"

reluctanly, this is ok for now. But I think we need to think this fresh and limit the tune specific changes a bit better, llvm takes a long time to compile and this could be inefficient for fleet of similar looking SOCs

Quoted 14 lines
meta/recipes-devtools/rust/rust-cross.inc +0 -1
  # 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
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#158292): https://lists.openembedded.org/g/openembedded-core/message/158292
Mute This Topic: https://lists.openembedded.org/mt/87069441/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw
In reply to Pgowda

This doesn't look hardknott related. Is this for master?

Thanks,

Anuj

Quoted 65 lines · Pgowda

rust-cross-* imported from meta-rust has incorrect signatures, depending on MACHINEOVERRIDES making it effectively MACHINE_ARCH as shown by sstate-diff-machines.sh:

openembedded-core/scripts/sstate-diff-machines.sh --tmpdir=tmp-glibc \
--machines="qemuarm64 qemuarm64copy" --targets=rust-cross-aarch64- glibc \
--analyze

 === Comparing signatures for task do_configure.sigdata between qemuarm64 and qemuarm64copy ===
ERROR: gcc-runtime different signature for task do_configure.sigdata between qemuarm64 and qemuarm64copy
NOTE: Starting bitbake server...
Hash for dependent task gcc/gcc- runtime_11.2.bb:do_prepare_recipe_sysroot
changed from da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 to 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40 Unable to find matching sigdata for openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_11.2.bb:
do_prepare_recipe_sysroot with hashes da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 or 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40

The following patch takes TUNE_PKGARCH into consideration instead of TARGET_ARCH and results in signatures as expected.

[YOCTO #14613]

---
 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..a77f7d5122 100644
@@ -34,7 +34,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc

virtual/${TARGET_PREFIX}compilerlibs vir
 DEPENDS += "rust-native"

 PROVIDES = "virtual/${TARGET_PREFIX}rust"

meta/recipes-devtools/rust/rust-cross.inc +1 -1
-PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}"
+PN = "rust-cross-${TUNE_PKGARCH}-${TCLIBC}"


 # 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

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#158292):
https://lists.openembedded.org/g/openembedded-core/message/158292
Mute This Topic: https://lists.openembedded.org/mt/87069441/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [
[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#3 lore raw

Hi Anuj,

I'm sorry regarding the patch subject.
The patch is for the master branch. However, the same issue exists for other branches as well.
I will check the comments from others and will post the patch to the Hardknott branch once it's approved in the master branch.

Thanks,
Pgowda

Quoted 74 lines · Anuj

This doesn't look hardknott related. Is this for master?

Thanks,

Anuj

Quoted 65 lines · Pgowda

rust-cross-* imported from meta-rust has incorrect signatures, depending on MACHINEOVERRIDES making it effectively MACHINE_ARCH as shown by sstate-diff-machines.sh:

openembedded-core/scripts/sstate-diff-machines.sh --tmpdir=tmp-glibc \
--machines="qemuarm64 qemuarm64copy" --targets=rust-cross-aarch64- glibc \
--analyze

=== Comparing signatures for task do_configure.sigdata between qemuarm64 and qemuarm64copy ===
ERROR: gcc-runtime different signature for task do_configure.sigdata between qemuarm64 and qemuarm64copy
NOTE: Starting bitbake server...
Hash for dependent task gcc/gcc- runtime_11.2.bb:do_prepare_recipe_sysroot
changed from da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 to 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40 Unable to find matching sigdata for openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_11.2.bb:
do_prepare_recipe_sysroot with hashes da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 or 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40

The following patch takes TUNE_PKGARCH into consideration instead of TARGET_ARCH and results in signatures as expected.

[YOCTO #14613]

---
 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..a77f7d5122 100644
@@ -34,7 +34,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc

virtual/${TARGET_PREFIX}compilerlibs vir
DEPENDS += "rust-native"

PROVIDES = "virtual/${TARGET_PREFIX}rust"

meta/recipes-devtools/rust/rust-cross.inc +1 -1
-PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}"
+PN = "rust-cross-${TUNE_PKGARCH}-${TCLIBC}"
 
 # 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

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#158292):
https://lists.openembedded.org/g/openembedded-core/message/158292
Mute This Topic: https://lists.openembedded.org/mt/87069441/3616702
Group Owner: [email protected] Unsubscribe:
https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#4 lore raw
In reply to Pgowda

Hi,

Gentle ping on this patch.

Thanks,
pgowda

Quoted 50 lines · Pgowda

rust-cross-* imported from meta-rust has incorrect signatures, depending on MACHINEOVERRIDES making it effectively MACHINE_ARCH as shown by sstate-diff-machines.sh:

openembedded-core/scripts/sstate-diff-machines.sh --tmpdir=tmp-glibc \
--machines="qemuarm64 qemuarm64copy" --targets=rust-cross-aarch64-glibc \
--analyze

=== Comparing signatures for task do_configure.sigdata between qemuarm64 and qemuarm64copy ===
ERROR: gcc-runtime different signature for task do_configure.sigdata between qemuarm64 and qemuarm64copy
NOTE: Starting bitbake server...
Hash for dependent task gcc/gcc-runtime_11.2.bb:do_prepare_recipe_sysroot changed from da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 to 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40 Unable to find matching sigdata for openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_11.2.bb:
do_prepare_recipe_sysroot with hashes da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 or 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40

The following patch takes TUNE_PKGARCH into consideration instead of TARGET_ARCH and results in signatures as expected.

[YOCTO #14613]

---
 meta/recipes-devtools/rust/rust-cross.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/rust/rust-cross.inc +1 -2
index bb625f4240..a77f7d5122 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-${TUNE_PKGARCH}-${TCLIBC}"
 
 # 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
--

2.31.1

#5 lore raw
Quoted 3 lines · Pgowda

Hi,

Gentle ping on this patch.

It's in master-next but it may not have been this morning.

$ pwd

.../oe-core.git

$ git status

On branch master-next

Your branch is up to date with 'origin/master-next'.

nothing to commit, working tree clean

git log --pretty=fuller

...
commit c2c3477377f3c41c6bf791a42d66386da17b0ba3

Author: Pgowda <[email protected]>

AuthorDate: Mon Nov 15 09:03:40 2021

Commit: Richard Purdie <[email protected]>

CommitDate: Tue Nov 16 17:22:18 2021

rust-cross: Replace TARGET_ARCH with TUNE_PKGARCH

../Randy

Quoted 65 lines

Thanks,
pgowda

Quoted 60 lines · Pgowda

rust-cross-* imported from meta-rust has incorrect signatures, depending on MACHINEOVERRIDES making it effectively MACHINE_ARCH as shown by sstate-diff-machines.sh:

openembedded-core/scripts/sstate-diff-machines.sh --tmpdir=tmp-glibc \
--machines="qemuarm64 qemuarm64copy" --targets=rust-cross-aarch64-glibc \
--analyze

=== Comparing signatures for task do_configure.sigdata between qemuarm64 and qemuarm64copy ===
ERROR: gcc-runtime different signature for task do_configure.sigdata between qemuarm64 and qemuarm64copy
NOTE: Starting bitbake server...
Hash for dependent task gcc/gcc-runtime_11.2.bb:do_prepare_recipe_sysroot changed from da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 to 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40 Unable to find matching sigdata for openembedded-core/meta/recipes-devtools/gcc/gcc-runtime_11.2.bb:
do_prepare_recipe_sysroot with hashes da4ebf1b272cb73153145a0a95e6438d2955ae2d36f84db10f6880b2781ec331 or 47a0ebb7a88c9f896fb9dbce269f575ab8a6faabb2b9e62d164be6e71c5e4e40

The following patch takes TUNE_PKGARCH into consideration instead of TARGET_ARCH and results in signatures as expected.

[YOCTO #14613]

---
  meta/recipes-devtools/rust/rust-cross.inc | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/rust/rust-cross.inc +1 -2
index bb625f4240..a77f7d5122 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-${TUNE_PKGARCH}-${TCLIBC}"
 
  # 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
--

2.31.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#158478): https://lists.openembedded.org/g/openembedded-core/message/158478
Mute This Topic: https://lists.openembedded.org/mt/87069441/3616765
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 2 lines
# Randy MacLeod
# Wind River Linux