mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-20 12:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "icecc.bbclass: Improve error reporting"

Browse Source 
This reverts commit b28114cf1e.

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>
This commit is contained in:
Joshua Watt
2018-04-20 08:54:06 -05:00
committed by Richard Purdie
parent a2a7ce7b68
commit d331af97a0
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
meta/classes/icecc.bbclass
View File

@@ -366,20 +366,14 @@ set_icecc_env() {
# the ICECC_VERSION generation step must be locked by a mutex # the ICECC_VERSION generation step must be locked by a mutex
# in order to prevent race conditions # in order to prevent race conditions
exit_code=0 if flock -n "${ICECC_VERSION}.lock" \
flock -n -E 10 "${ICECC_VERSION}.lock" \ ${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}"
${ICECC_ENV_EXEC} ${ICECC_ENV_DEBUG} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}" || exit_code=$? then
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"
touch "${ICECC_VERSION}.done" 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 return
fi fi
fi fi