diff options
| author | Douglas Royds <douglas.royds@taitradio.com> | 2018-12-20 11:59:46 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-28 16:56:26 +0000 |
| commit | d4ec47005d29e30b31bc61fe126b385e9e781228 (patch) | |
| tree | a2d596ff12dd9482c98713e73f391c7eb2f66bca | |
| parent | 57673fe89a9c597d7e1d657a0710f3c60df3c28d (diff) | |
| download | openembedded-core-d4ec47005d29e30b31bc61fe126b385e9e781228.tar.gz openembedded-core-d4ec47005d29e30b31bc61fe126b385e9e781228.tar.bz2 openembedded-core-d4ec47005d29e30b31bc61fe126b385e9e781228.zip | |
icecc: Syntax error meant that we weren't waiting for tarball generation
If two bitbake processes try to generate the ICECC_VERSION tarball at the same
time, the thread that fails to get the lock will wait 30 sec for the first to
finish. A syntax error meant that this was not happening, and in particular, if
tarball generation failed (eg. for lack of patchelf), it did so silently.
(From OE-Core rev: 4455c46bf7f49c2b44f250aa89b63b342368e2e3)
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/classes/icecc.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index d8a7894887..2171e11db0 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -387,7 +387,7 @@ set_icecc_env() { ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}" then touch "${ICECC_VERSION}.done" - elif [ ! wait_for_file "${ICECC_VERSION}.done" 30 ] + elif ! wait_for_file "${ICECC_VERSION}.done" 30 then # locking failed so wait for ${ICECC_VERSION}.done to appear bbwarn "Timeout waiting for ${ICECC_VERSION}.done" |