summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Royds <douglas.royds@taitradio.com>2018-12-20 11:59:46 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-19 23:58:50 +0000
commita020137e18bcfa9dfe358f9f497cc7e1f5505d2c (patch)
treee1e2fd3e496ea9bf7cbc14ec9443f1fd4a9ba8eb
parent5a0e2f8f2b530efa2ac2f89183fad538caecea24 (diff)
downloadopenembedded-core-contrib-a020137e18bcfa9dfe358f9f497cc7e1f5505d2c.tar.gz
openembedded-core-contrib-a020137e18bcfa9dfe358f9f497cc7e1f5505d2c.tar.bz2
openembedded-core-contrib-a020137e18bcfa9dfe358f9f497cc7e1f5505d2c.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. Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/icecc.bbclass2
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"