summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorTomasz Dziendzielski <tomasz.dziendzielski@gmail.com>2021-01-15 14:42:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-27 09:32:45 +0000
commita54010ae2e9e9afd9c2dcdbefd31a0fd4e7210fe (patch)
tree8fb6f95ce85241022700374d95140d41007c58bb /meta/lib
parent12d56881209e515c38cade2f648edda535638504 (diff)
downloadpoky-a54010ae2e9e9afd9c2dcdbefd31a0fd4e7210fe.tar.gz
lib/oe/utils: Return empty string in parallel_make
In cmake.bbclass we set CMAKE_BUILD_PARALLEL_LEVEL using parallel_make function and if PARALLEL_MAKE is set to empty string then this variable is exported as "None" causing cmake to fail with: "'CMAKE_BUILD_PARALLEL_LEVEL' environment variable invalid number 'None' given." (From OE-Core rev: 7ee65c50f7a38c22e3fb43b0c89e81aff24a2b7f) Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2f790ded554a52ac18d1c28002142f9c62abec8b) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 468c76f30f..9a2187e36f 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -193,7 +193,7 @@ def parallel_make(d, makeinst=False):
193 193
194 return int(v) 194 return int(v)
195 195
196 return None 196 return ''
197 197
198def parallel_make_argument(d, fmt, limit=None, makeinst=False): 198def parallel_make_argument(d, fmt, limit=None, makeinst=False):
199 """ 199 """