diff options
author | Douglas Royds <douglas.royds@taitradio.com> | 2018-12-20 11:59:46 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-20 14:53:55 +0000 |
commit | 45a59ffbd6f111c752057cff018678fd454636e6 (patch) | |
tree | 2271d6b1214e5e2d8d6bd212c62a5cbe3e97018f | |
parent | 7e80de311cd83edde595eff457c55fef1ef07a51 (diff) | |
download | poky-45a59ffbd6f111c752057cff018678fd454636e6.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)
Signed-off-by: Douglas Royds <douglas.royds@taitradio.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() { | |||
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" |