Fix Parallel.

This commit is contained in:
fewtarius 2023-02-25 08:35:44 -05:00
parent e444381100
commit d665f46f5d
No known key found for this signature in database
GPG key ID: F4AE55305D1B8C1A
3 changed files with 3 additions and 27 deletions

View file

@ -1514,15 +1514,6 @@ pkg_lock() {
if [ -f "${THREAD_CONTROL}/locks/${pkg}.${task}.failed" ]; then
fail_seq="$(< "${THREAD_CONTROL}/locks/${pkg}.${task}.failed")"
print_color CLR_ERROR "FAILURE: ${pkg}.${task}.failed exists, a previous dependency process has failed (seq: ${fail_seq})\n"
if [ -d "${THREAD_CONTROL}/logs" ]; then
cat <<EOF
The following logs for this failure are available:
stdout: ${THREAD_CONTROL}/logs/${fail_seq}/stdout
stderr: ${THREAD_CONTROL}/logs/${fail_seq}/stderr
EOF
fi
return 1
fi

View file

@ -70,13 +70,9 @@ package_worker() {
fi
if [ ${result} -ne 0 ]; then
if [ -d "${THREAD_CONTROL}/logs" ]; then
echo "${PKG_NAME} ${THREAD_CONTROL}/logs/${job}/stdout" >>"${THREAD_CONTROL}/addons.failed"
else
echo "${PKG_NAME}" >>"${THREAD_CONTROL}/addons.failed"
fi
fi
fi
(
flock --exclusive 95
@ -94,16 +90,6 @@ package_worker() {
pkg_lock_status "FAILED" "${pkgname}" "${task}"
print_color CLR_ERROR "FAILURE: ${SCRIPTS}/${task} ${pkgname} has failed!\n"
if [ -d "${THREAD_CONTROL}/logs" ]; then
cat >&2 <<EOF
The following logs for this failure are available:
stdout: ${THREAD_CONTROL}/logs/${job}/stdout
stderr: ${THREAD_CONTROL}/logs/${job}/stderr
EOF
fi
fi
return ${result}
@ -134,8 +120,7 @@ start_multithread_build() {
if [ "${singlethread}" = "yes" -a "${ONELOG,,}" != "no" ] || [ "${ONELOG,,}" = "yes" ]; then
buildopts+=" --ungroup"
else
mkdir -p "${THREAD_CONTROL}/logs"
buildopts+=" --group --results ${THREAD_CONTROL}/logs/{#}/"
buildopts+=" --group"
fi
# When building addons, don't halt on error - keep building all packages/addons

View file

@ -2,7 +2,7 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="parallel"
PKG_VERSION="20210622" # Note: Remember to debug why this version is working but 20210722 does not.
PKG_VERSION="20230222"
PKG_LICENSE="GPLv3"
PKG_SITE="https://www.gnu.org/software/parallel/"
PKG_URL="http://ftpmirror.gnu.org/parallel/${PKG_NAME}-${PKG_VERSION}.tar.bz2"