summaryrefslogtreecommitdiffstats
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 11:15:06 +0100
commit802a2877a78a44c17f3e142f7d12017a08d09dad (patch)
tree7df770a785bf9462521e5e33afafa995f3c90412
parent935542f96c0706a6c5f9b0a77fce175733995f49 (diff)
downloadopenembedded-core-802a2877a78a44c17f3e142f7d12017a08d09dad.tar.gz
openembedded-core-802a2877a78a44c17f3e142f7d12017a08d09dad.tar.bz2
openembedded-core-802a2877a78a44c17f3e142f7d12017a08d09dad.zip
Revert "icecc.bbclass: Improve error reporting"
This reverts commit b28114cf1e58643bd233bc0c83d6d8138952b7ac. The "-E" option for flock is not ubiquitously supported, so don't use it. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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() {
# the ICECC_VERSION generation step must be locked by a mutex
# in order to prevent race conditions
- exit_code=0
- flock -n -E 10 "${ICECC_VERSION}.lock" \
- ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}" || exit_code=$?
- if [ "$exit_code" -eq 0 ]; then
- touch "${ICECC_VERSION}.done"
- elif [ "$exit_code" -eq "10" ]; then
- if [ ! 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"
- return
- fi
- else
- bbwarn "Could not create icecc environment: $exit_code"
+ if flock -n "${ICECC_VERSION}.lock" \
+ ${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 ]
+ then
+ # locking failed so wait for ${ICECC_VERSION}.done to appear
+ bbwarn "Timeout waiting for ${ICECC_VERSION}.done"
return
fi
fi