]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
rust-common: Fix native signature dependency issues
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 21 May 2022 13:12:15 +0000 (14:12 +0100)
committerSteve Sakoman <steve@sakoman.com>
Thu, 2 Jun 2022 02:33:15 +0000 (16:33 -1000)
The previous changes cause sstatetests.SStateTests.test_sstate_32_64_same_hash
to fail since RUST_XXX_SYS changes depending on the native architecture. This
is correct but these are accounted for in the layout of paths in TMPDIR so
they should be excluded from the task signatures for the correct behaviour.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2b9bb4c07d0ab53f58cbdd8a96896780a90be9a8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-devtools/rust/rust-common.inc

index 3cdce364390700c0669a2aa79f69c55d08402ed4..621cd4ad5760459303e95afdcbc2a96d55e79073 100644 (file)
@@ -347,6 +347,9 @@ def rust_gen_target(d, thing, wd, features, cpu, arch, abi=""):
     with open(wd + sys + '.json', 'w') as f:
         json.dump(tspec, f, indent=4)
 
+# These are accounted for in tmpdir path names so don't need to be in the task sig
+rust_gen_target[vardepsexclude] += "RUST_HOST_SYS RUST_TARGET_SYS"
+
 do_rust_gen_targets[vardeps] += "DATA_LAYOUT TARGET_ENDIAN TARGET_POINTER_WIDTH TARGET_C_INT_WIDTH MAX_ATOMIC_WIDTH FEATURES"
 
 python do_rust_gen_targets () {