diff options
| author | Joshua Watt <jpewhacker@gmail.com> | 2018-02-16 14:30:00 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-24 10:31:45 +0000 |
| commit | c4172f3f7645d43cd63d782772798f3e1138bd9e (patch) | |
| tree | ab5f907b75018868e2861b7cc3da682f21e7c5ff | |
| parent | 704d0b114d99cc5bd556730de1370c2c058e822e (diff) | |
| download | poky-c4172f3f7645d43cd63d782772798f3e1138bd9e.tar.gz | |
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.
(From OE-Core rev: 45205be547967c84dff96403c3a6825a62e3ca6a)
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index ec91927233..80f0442d0a 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): | |||
| 195 | v = parallel_make(d) | 195 | v = parallel_make(d) |
| 196 | if v: | 196 | if v: |
| 197 | if limit: | 197 | if limit: |
| 198 | v = max(limit, v) | 198 | v = min(limit, v) |
| 199 | return fmt % v | 199 | return fmt % v |
| 200 | return '' | 200 | return '' |
| 201 | 201 | ||
