summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-07 14:26:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-08 15:43:59 (GMT)
commit6fdceeab2057612f61755a74097c35d2290945d6 (patch)
tree9b2062acd55dfe962e95cb2cec62be61400e197f /meta/conf
parentf5e1c084d7e562094d00dc384ab970686738e76e (diff)
downloadpoky-6fdceeab2057612f61755a74097c35d2290945d6.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: 64003e5e1b51c0cd561681b1ac13293546b8182b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/multilib.conf2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 8a8db58..7f3b946 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -11,6 +11,8 @@ STAGING_DIR_TARGET = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
11RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot" 11RECIPE_SYSROOT = "${WORKDIR}/${MLPREFIX}recipe-sysroot"
12RECIPE_SYSROOT:class-native = "${WORKDIR}/recipe-sysroot" 12RECIPE_SYSROOT:class-native = "${WORKDIR}/recipe-sysroot"
13 13
14PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${MLPREFIX}recipe-sysroot"
15
14INHERIT += "multilib_global" 16INHERIT += "multilib_global"
15 17
16BBCLASSEXTEND:append = " ${MULTILIBS}" 18BBCLASSEXTEND:append = " ${MULTILIBS}"