summaryrefslogtreecommitdiffstats
path: root/meta
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-16 22:39:17 +0000
commit2f790ded554a52ac18d1c28002142f9c62abec8b (patch)
treec7e4586df8c82939da16ea9ce126129f7a6f4ea8 /meta
parent95686432ecb7e411155563643d59a3d5f683937c (diff)
downloadopenembedded-core-contrib-2f790ded554a52ac18d1c28002142f9c62abec8b.tar.gz
openembedded-core-contrib-2f790ded554a52ac18d1c28002142f9c62abec8b.tar.bz2
openembedded-core-contrib-2f790ded554a52ac18d1c28002142f9c62abec8b.zip
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." Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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):
return int(v)
- return None
+ return ''
def parallel_make_argument(d, fmt, limit=None, makeinst=False):
"""