From b86719b883039323b938dc28e15176f4e425ad60 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Wed, 25 Apr 2018 17:29:53 +0700 Subject: [PATCH] sqg: Remove parallel detection. Signed-off-by: Willy Sudiarto Raharjo --- src/usr/libexec/sbopkg/sqg/functions | 23 +---------------------- tools/ChangeLog-latest.txt | 3 +-- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/usr/libexec/sbopkg/sqg/functions b/src/usr/libexec/sbopkg/sqg/functions index 2bb4832..b885214 100644 --- a/src/usr/libexec/sbopkg/sqg/functions +++ b/src/usr/libexec/sbopkg/sqg/functions @@ -37,18 +37,6 @@ sanity_checks () { 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. # @@ -237,19 +225,10 @@ execute_build () { VERBOSE="yes" fi - has_parallel - if [ $? -eq 1 ]; then - printf '%s\n' "${PKGSNEW[@]}" | \ + printf '%s\n' "${PKGSNEW[@]}" | \ parallel --eta --will-cite --jobs $JOBS \ /usr/libexec/sbopkg/sqg/sqg-build-queuefile \ "$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 build_queuefile_custom "$QUEUEDIR" "$CUSTOM_QUEUE" "$PKGS" diff --git a/tools/ChangeLog-latest.txt b/tools/ChangeLog-latest.txt index ac79d00..17fdbad 100644 --- a/tools/ChangeLog-latest.txt +++ b/tools/ChangeLog-latest.txt @@ -1,9 +1,8 @@ SBOPKG NEWS -sbopkg-dev (2018-01-14 10:17:13 UTC) +sbopkg-dev (2018-04-25 10:27:24 UTC) FEATURES * sqg: Parallelize building of single and all packages by option -j. - Requires GNU Parallel. Patch by Marcel Saegebarth. * sqg: Introduced new simple filesystem cache. This will reduce queue generation time significantly when