summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-04-20 08:54:06 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-23 17:26:04 +0100
commitd331af97a0219a34b412f61dc429af58262f088c (patch)
treee1bf86e1498ddabdec0120c632ed510894173b03 /meta
parenta2a7ce7b68c290b02d886dc53ab3f0570e61c5e7 (diff)
downloadpoky-d331af97a0219a34b412f61dc429af58262f088c.tar.gz
Revert "icecc.bbclass: Improve error reporting"
This reverts commit b28114cf1e58643bd233bc0c83d6d8138952b7ac. The "-E" option for flock is not ubiquitously supported, so don't use it. (From OE-Core rev: 802a2877a78a44c17f3e142f7d12017a08d09dad) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/icecc.bbclass20
1 files changed, 7 insertions, 13 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 73eba7a6a9..0ca8de86c2 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -366,20 +366,14 @@ set_icecc_env() {
366 366
367 # the ICECC_VERSION generation step must be locked by a mutex 367 # the ICECC_VERSION generation step must be locked by a mutex
368 # in order to prevent race conditions 368 # in order to prevent race conditions
369 exit_code=0 369 if flock -n "${ICECC_VERSION}.lock" \
370 flock -n -E 10 "${ICECC_VERSION}.lock" \ 370 ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}"
371 ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}" || exit_code=$? 371 then
372 if [ "$exit_code" -eq 0 ]; then
373 touch "${ICECC_VERSION}.done"
374 elif [ "$exit_code" -eq "10" ]; then
375 if [ ! wait_for_file "${ICECC_VERSION}.done" 30 ]; then
376 # locking failed so wait for ${ICECC_VERSION}.done to appear
377 bbwarn "Timeout waiting for ${ICECC_VERSION}.done"
378 return
379 fi
380 else
381 bbwarn "Could not create icecc environment: $exit_code"
382 touch "${ICECC_VERSION}.done" 372 touch "${ICECC_VERSION}.done"
373 elif [ ! wait_for_file "${ICECC_VERSION}.done" 30 ]
374 then
375 # locking failed so wait for ${ICECC_VERSION}.done to appear
376 bbwarn "Timeout waiting for ${ICECC_VERSION}.done"
383 return 377 return
384 fi 378 fi
385 fi 379 fi