aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/bash/function
diff options
context:
space:
mode:
authorJuraj Linkeš <juraj.linkes@pantheon.tech>2020-06-01 08:22:42 +0200
committerJuraj Linkeš <juraj.linkes@pantheon.tech>2020-07-23 13:11:53 +0200
commit0d676cebb06deba4d5b2d6eb49d74e8238f77485 (patch)
tree33c615efd0586c4c884fb39fa90a4c09fb876202 /resources/libraries/bash/function
parent40537fb9c1045de244424ea989bb0e84d8640b8b (diff)
perpatch: Echo MAKE_PARALLEL_* var before build
VPP uses MAKE_PARALLEL_FLAGS or MAKE_PARALLEL_JOBS to limit the number of cpus to use during build, so emit a line on stdout if it's used. Change-Id: I669398d474d172abb6c848a45f24f1bdd56990d8 Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Diffstat (limited to 'resources/libraries/bash/function')
-rw-r--r--resources/libraries/bash/function/per_patch.sh16
1 files changed, 15 insertions, 1 deletions
diff --git a/resources/libraries/bash/function/per_patch.sh b/resources/libraries/bash/function/per_patch.sh
index abf2cac688..8b97780cec 100644
--- a/resources/libraries/bash/function/per_patch.sh
+++ b/resources/libraries/bash/function/per_patch.sh
@@ -1,4 +1,5 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2020 PANTHEON.tech s.r.o.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -73,6 +74,8 @@ function build_vpp_ubuntu_amd64 () {
# Arguments:
# - ${1} - String identifier for echo, can be unset.
# Variables read:
+ # - MAKE_PARALLEL_FLAGS - Make flags when building VPP.
+ # - MAKE_PARALLEL_JOBS - Number of cores to use when building VPP.
# - VPP_DIR - Path to existing directory, parent to accessed directories.
# Directories updated:
# - ${VPP_DIR} - Whole subtree, many files (re)created by the build process.
@@ -82,6 +85,17 @@ function build_vpp_ubuntu_amd64 () {
set -exuo pipefail
cd "${VPP_DIR}" || die "Change directory command failed."
+ if [ -n "${MAKE_PARALLEL_FLAGS-}" ]; then
+ echo "Building VPP. Number of cores for build set with" \
+ "MAKE_PARALLEL_FLAGS='${MAKE_PARALLEL_FLAGS}'."
+ elif [ -n "${MAKE_PARALLEL_JOBS-}" ]; then
+ echo "Building VPP. Number of cores for build set with" \
+ "MAKE_PARALLEL_JOBS='${MAKE_PARALLEL_JOBS}'."
+ else
+ echo "Building VPP. Number of cores not set, " \
+ "using build default ($(grep -c ^processor /proc/cpuinfo))."
+ fi
+
make UNATTENDED=y pkg-verify || die "VPP build using make pkg-verify failed."
echo "* VPP ${1-} BUILD SUCCESSFULLY COMPLETED" || {
die "Argument not found."