diff options
author | Mike Crowe <mac@mcrowe.com> | 2019-12-17 08:02:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-28 11:51:03 +0000 |
commit | 297debd5ea610aeffe4fe099fee893063115e437 (patch) | |
tree | 6f23b58f1e9aa01056623ff939af209f275ec84b /meta/conf | |
parent | 8fdf082c11131524d803e61f9272aec319811a3d (diff) | |
download | poky-297debd5ea610aeffe4fe099fee893063115e437.tar.gz |
multilib.conf: Ensure that RECIPE_SYSROOT is unchanged for native
Ensure that RECIPE_SYSROOT is the same for -native recipes whether
multilib.conf is included or not.
Without this change task signatures for -native recipes change when
switching between MACHINEs that require multilib.conf and those that
don't.
This fix was one of the ones suggested by Khem Raj in
http://lists.openembedded.org/pipermail/openembedded-core/2019-December/290303.html
Add test_sstate_multilib_or_not_native_samesigs test case to
sstatetests.py to ensure that this stays fixed.
(From OE-Core rev: c3e957409bf68e7b310e27781ac91d24cf4452bf)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit aa05f1ded71366b86eda7fce24d8b5395e85ada2)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/multilib.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index cfed3fbbd0..58f2ac5c86 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf | |||
@@ -9,6 +9,7 @@ MULTILIBS ??= "multilib:lib32" | |||
9 | STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 9 | STAGING_DIR_HOST = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
10 | STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 10 | STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
11 | RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" | 11 | RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" |
12 | RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot" | ||
12 | 13 | ||
13 | INHERIT += "multilib_global" | 14 | INHERIT += "multilib_global" |
14 | 15 | ||