From fa4bcfdb73167f8159b88e5a4d711c0d37627a70 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Thu, 14 Jul 2011 14:05:42 -0700 Subject: bb-matrix: correct BB and PM number canonicalization The bash string operation ${BB##*0} was greedy and in addition to converting "02" to "2", also converted "20" to "", causing all builds for a BB value ending in 0 to run with BB_NUMBER_THREADS=1. (From OE-Core rev: b975de5ea76c5f8827fb48c0c3c29902872ad3d6) Signed-off-by: Darren Hart Signed-off-by: Richard Purdie --- scripts/contrib/bb-perf/bb-matrix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/contrib') diff --git a/scripts/contrib/bb-perf/bb-matrix.sh b/scripts/contrib/bb-perf/bb-matrix.sh index 64d55137c8..b9edd5ff08 100755 --- a/scripts/contrib/bb-perf/bb-matrix.sh +++ b/scripts/contrib/bb-perf/bb-matrix.sh @@ -62,8 +62,8 @@ for BB in $BB_RANGE; do echo "BB=$BB PM=$PM Logging to $BB_LOG" # Export the variables under test and run the bitbake command - export BB_NUMBER_THREADS="${BB##*0}" - export PARALLEL_MAKE="-j ${PM##*0}" + export BB_NUMBER_THREADS=$(echo $BB | sed 's/^0*//') + export PARALLEL_MAKE="-j $(echo $PM | sed 's/^0*//')" /usr/bin/time -f "$BB $PM $TIME_STR" -a -o $RUNTIME_LOG $BB_CMD &> $BB_LOG echo " $(tail -n1 $RUNTIME_LOG)" -- cgit v1.2.3-54-g00ecf