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/useradd.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/useradd.bbclass')
-rw-r--r-- | meta/classes/useradd.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 124becd082..5e600dec84 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -100,6 +100,8 @@ useradd_sysroot () { | |||
100 | # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running | 100 | # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running |
101 | # at this point so we're explicit about the environment so pseudo can load if | 101 | # at this point so we're explicit about the environment so pseudo can load if |
102 | # not already present. | 102 | # not already present. |
103 | # PSEUDO_SYSROOT can contain references to the build architecture and COMPONENT_DIR | ||
104 | # so needs the STAGING_FIXME below | ||
103 | export PSEUDO="${FAKEROOTENV} ${PSEUDO_SYSROOT}${bindir_native}/pseudo" | 105 | export PSEUDO="${FAKEROOTENV} ${PSEUDO_SYSROOT}${bindir_native}/pseudo" |
104 | 106 | ||
105 | # Explicitly set $D since it isn't set to anything | 107 | # Explicitly set $D since it isn't set to anything |
@@ -134,10 +136,10 @@ useradd_sysroot () { | |||
134 | } | 136 | } |
135 | 137 | ||
136 | # The export of PSEUDO in useradd_sysroot() above contains references to | 138 | # The export of PSEUDO in useradd_sysroot() above contains references to |
137 | # ${COMPONENTS_DIR} and ${PSEUDO_LOCALSTATEDIR}. Additionally, the logging | 139 | # ${PSEUDO_SYSROOT} and ${PSEUDO_LOCALSTATEDIR}. Additionally, the logging |
138 | # shell functions use ${LOGFIFO}. These need to be handled when restoring | 140 | # shell functions use ${LOGFIFO}. These need to be handled when restoring |
139 | # postinst-useradd-${PN} from the sstate cache. | 141 | # postinst-useradd-${PN} from the sstate cache. |
140 | EXTRA_STAGING_FIXMES += "COMPONENTS_DIR PSEUDO_LOCALSTATEDIR LOGFIFO" | 142 | EXTRA_STAGING_FIXMES += "PSEUDO_SYSROOT PSEUDO_LOCALSTATEDIR LOGFIFO" |
141 | 143 | ||
142 | python useradd_sysroot_sstate () { | 144 | python useradd_sysroot_sstate () { |
143 | scriptfile = None | 145 | scriptfile = None |