From: Joshua Watt <jpewhacker@gmail.com>
Date: Fri, 16 Feb 2018 20:30:00 +0000 (-0600)
Subject: utils.py: Fix parallel_make limit
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~18719
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45205be547967c84dff96403c3a6825a62e3ca6a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

utils.py: Fix parallel_make limit

parallel_make_argument() was incorrectly taking the maximum of the limit
and the calculated value instead of the minimum.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index ec91927233a..80f0442d0ae 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -195,7 +195,7 @@ def parallel_make_argument(d, fmt, limit=None):
     v = parallel_make(d)
     if v:
         if limit:
-            v = max(limit, v)
+            v = min(limit, v)
         return fmt % v
     return ''