]> code.ossystems Code Review - openembedded-core.git/commitdiff
icecc: Syntax error meant that we weren't waiting for tarball generation
authorDouglas Royds <douglas.royds@taitradio.com>
Wed, 19 Dec 2018 22:59:46 +0000 (11:59 +1300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 20 Dec 2018 13:40:17 +0000 (13:40 +0000)
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>
meta/classes/icecc.bbclass

index d8a7894887fc613c64ca8e64c8e553217147b9ef..2171e11db073f9e3cfd632540ef55f6fd60ca505 100644 (file)
@@ -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"