summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorDouglas Royds <douglas.royds@taitradio.com>2018-12-20 11:59:46 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-06 16:38:30 +0000
commit62333edce7b8e78117d6e7b25ebc996c2586c082 (patch)
treef83886d658f2f54732f3e84ea5a9a05f3a147143 /meta/classes
parentf05f48d4257961776684785dead33d85e88c0beb (diff)
downloadpoky-62333edce7b8e78117d6e7b25ebc996c2586c082.tar.gz
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) (From OE-Core rev: d4ec47005d29e30b31bc61fe126b385e9e781228) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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() {
387 ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}" 387 ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}"
388 then 388 then
389 touch "${ICECC_VERSION}.done" 389 touch "${ICECC_VERSION}.done"
390 elif [ ! wait_for_file "${ICECC_VERSION}.done" 30 ] 390 elif ! wait_for_file "${ICECC_VERSION}.done" 30
391 then 391 then
392 # locking failed so wait for ${ICECC_VERSION}.done to appear 392 # locking failed so wait for ${ICECC_VERSION}.done to appear
393 bbwarn "Timeout waiting for ${ICECC_VERSION}.done" 393 bbwarn "Timeout waiting for ${ICECC_VERSION}.done"