diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-07 15:26:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-23 23:14:16 +0100 |
| commit | fed017998a3ee7a9877f05fd78916923fd0fd99d (patch) | |
| tree | a9d77fd9a5af060e398434f7126877a3a5d1d854 /meta/conf | |
| parent | e0cb0077e266c6b15858b75b467d22d1c415a532 (diff) | |
| download | poky-fed017998a3ee7a9877f05fd78916923fd0fd99d.tar.gz | |
multilib: Avoid sysroot race issues when multilib enabled
Multilib changes RECIPE_SYSROOT which can make the value in PSEUDO_IGNORE_PATHS
incorrect. Add the correct value, which fixes races over files in the sysroot.
[YOCTO #14581]
(From OE-Core rev: 771c7fe5fff266038954873290f4c785f66c1634)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 64003e5e1b51c0cd561681b1ac13293546b8182b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/multilib.conf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index d231107f8b..e9767c73b6 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf | |||
| @@ -11,6 +11,8 @@ 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 | RECIPE_SYSROOT_class-native = "${WORKDIR}/recipe-sysroot" |
| 13 | 13 | ||
| 14 | PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot" | ||
| 15 | |||
| 14 | INHERIT += "multilib_global" | 16 | INHERIT += "multilib_global" |
| 15 | 17 | ||
| 16 | BBCLASSEXTEND_append = " ${MULTILIBS}" | 18 | BBCLASSEXTEND_append = " ${MULTILIBS}" |