diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-31 08:54:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-31 15:36:20 +0100 |
commit | 464a2fed0be067b0ad703b3474b9e01566bf80d3 (patch) | |
tree | 7171180673bb46f47423a598cd29cc815e3939b7 /meta/classes/staging.bbclass | |
parent | a07a6a74159d9fa2d0ca52c990f69ceac7c237d8 (diff) | |
download | poky-464a2fed0be067b0ad703b3474b9e01566bf80d3.tar.gz |
useradd: Fix build architecture corruption of sstate artefacts
When mixing aarch64 and x86_64 host builds with common sstate, useradd failures
were found. This was due to references to:
/home/pokybuild/yocto-worker/qemuarm/build/build/tmp/sysroots-components/aarch64/pseudo-native/usr/bin/pseudo
or
/home/pokybuild/yocto-worker/qemuarm/build/build/tmp/sysroots-components/x86_64/pseudo-native/usr/bin/pseudo
on the wrong architecture within the useradd postinst files.
Instead of using COMPONENTS_DIR as the FIXME, use PSEUDO_SYSROOT which contains
the arch component as well to avoid this.
Add extra comments to cause the relavent sstate to be rebuilt.
(From OE-Core rev: 0384622f72a6c0bd8225cf06f692340fdef67d4a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 6bcd0b087a..9207060222 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -168,7 +168,7 @@ def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d): | |||
168 | if not fixme: | 168 | if not fixme: |
169 | return | 169 | return |
170 | cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative) | 170 | cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative) |
171 | for fixmevar in ['COMPONENTS_DIR', 'HOSTTOOLS_DIR', 'PKGDATA_DIR', 'PSEUDO_LOCALSTATEDIR', 'LOGFIFO']: | 171 | for fixmevar in ['PSEUDO_SYSROOT', 'HOSTTOOLS_DIR', 'PKGDATA_DIR', 'PSEUDO_LOCALSTATEDIR', 'LOGFIFO']: |
172 | fixme_path = d.getVar(fixmevar) | 172 | fixme_path = d.getVar(fixmevar) |
173 | cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) | 173 | cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) |
174 | bb.debug(2, cmd) | 174 | bb.debug(2, cmd) |