diff options
author | Pgowda <pgowda.cve@gmail.com> | 2021-11-15 06:03:40 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-23 10:53:15 +0000 |
commit | 8c5e589df8e3e6cf5797495714d70228cae247a8 (patch) | |
tree | 6afd17be4c60928e45eab7bdb90c72b4be821ba2 /meta | |
parent | cdab3b7c31a330ebeef18c351b360ba474b0bdf5 (diff) | |
download | poky-8c5e589df8e3e6cf5797495714d70228cae247a8.tar.gz |
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]
RP: Added maintainer.inc corresponding change
(From OE-Core rev: bcf48766d1123cea41f80b0cb687584692c96158)
Signed-off-by: Pgowda <pgowda.cve@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/rust/rust-cross.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index f3e0a75d56..ed21fbf39a 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -664,7 +664,7 @@ RECIPE_MAINTAINER:pn-ruby = "Ross Burton <ross.burton@arm.com>" | |||
664 | RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton <ross.burton@arm.com>" | 664 | RECIPE_MAINTAINER:pn-run-postinsts = "Ross Burton <ross.burton@arm.com>" |
665 | RECIPE_MAINTAINER:pn-rust = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 665 | RECIPE_MAINTAINER:pn-rust = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
666 | RECIPE_MAINTAINER:pn-rustfmt = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 666 | RECIPE_MAINTAINER:pn-rustfmt = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
667 | RECIPE_MAINTAINER:pn-rust-cross-${TARGET_ARCH}-${TCLIBC} = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 667 | RECIPE_MAINTAINER:pn-rust-cross-${TUNE_PKGARCH}-${TCLIBC} = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
668 | RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 668 | RECIPE_MAINTAINER:pn-rust-cross-canadian-${TRANSLATED_TARGET_ARCH} = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
669 | RECIPE_MAINTAINER:pn-rust-hello-world = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 669 | RECIPE_MAINTAINER:pn-rust-hello-world = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
670 | RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod <Randy.MacLeod@windriver.com>" | 670 | RECIPE_MAINTAINER:pn-rust-llvm = "Randy MacLeod <Randy.MacLeod@windriver.com>" |
diff --git a/meta/recipes-devtools/rust/rust-cross.inc b/meta/recipes-devtools/rust/rust-cross.inc index bb625f4240..a77f7d5122 100644 --- a/meta/recipes-devtools/rust/rust-cross.inc +++ b/meta/recipes-devtools/rust/rust-cross.inc | |||
@@ -34,7 +34,7 @@ DEPENDS += "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs vir | |||
34 | DEPENDS += "rust-native" | 34 | DEPENDS += "rust-native" |
35 | 35 | ||
36 | PROVIDES = "virtual/${TARGET_PREFIX}rust" | 36 | PROVIDES = "virtual/${TARGET_PREFIX}rust" |
37 | PN = "rust-cross-${TARGET_ARCH}-${TCLIBC}" | 37 | PN = "rust-cross-${TUNE_PKGARCH}-${TCLIBC}" |
38 | 38 | ||
39 | # In the cross compilation case, rustc doesn't seem to get the rpath quite | 39 | # In the cross compilation case, rustc doesn't seem to get the rpath quite |
40 | # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't | 40 | # right. It manages to include '../../lib/${TARGET_PREFIX}', but doesn't |