sqg: Remove parallel detection.

Signed-off-by: Willy Sudiarto Raharjo <willysr@sbopkg.org>
This commit is contained in:
Willy Sudiarto Raharjo 2018-04-25 17:29:53 +07:00
parent e5219788af
commit b86719b883
No known key found for this signature in database
GPG Key ID: 887B8374D7333381
2 changed files with 2 additions and 24 deletions

View File

@ -37,18 +37,6 @@ sanity_checks () {
mkdir -p "$SQG_TMP_DIR" mkdir -p "$SQG_TMP_DIR"
} }
#
# Returns 1 if GNU Parallel is installed. Otherwise 0.
#
has_parallel () {
parallel --help &> /dev/null
if [ $? -eq 0 ]; then
return 1
fi
return 0
}
# #
# Prints the help message. # Prints the help message.
# #
@ -237,19 +225,10 @@ execute_build () {
VERBOSE="yes" VERBOSE="yes"
fi fi
has_parallel
if [ $? -eq 1 ]; then
printf '%s\n' "${PKGSNEW[@]}" | \ printf '%s\n' "${PKGSNEW[@]}" | \
parallel --eta --will-cite --jobs $JOBS \ parallel --eta --will-cite --jobs $JOBS \
/usr/libexec/sbopkg/sqg/sqg-build-queuefile \ /usr/libexec/sbopkg/sqg/sqg-build-queuefile \
"$REPO_DIR" "$QUEUEDIR" {} "$VERBOSE" "$REPO_DIR" "$QUEUEDIR" {} "$VERBOSE"
else
for PKG in "${PKGSNEW[@]}"; do
printf "."
/usr/libexec/sbopkg/sqg/sqg-build-queuefile \
"$REPO_DIR" "$QUEUEDIR" "$PKG" "$VERBOSE"
done
fi
if [ ! -z $CUSTOM_QUEUE ]; then if [ ! -z $CUSTOM_QUEUE ]; then
build_queuefile_custom "$QUEUEDIR" "$CUSTOM_QUEUE" "$PKGS" build_queuefile_custom "$QUEUEDIR" "$CUSTOM_QUEUE" "$PKGS"

View File

@ -1,9 +1,8 @@
SBOPKG NEWS SBOPKG NEWS
sbopkg-dev (2018-01-14 10:17:13 UTC) sbopkg-dev (2018-04-25 10:27:24 UTC)
FEATURES FEATURES
* sqg: Parallelize building of single and all packages by option -j. * sqg: Parallelize building of single and all packages by option -j.
Requires GNU Parallel.
Patch by Marcel Saegebarth. Patch by Marcel Saegebarth.
* sqg: Introduced new simple filesystem cache. * sqg: Introduced new simple filesystem cache.
This will reduce queue generation time significantly when This will reduce queue generation time significantly when