From: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Date: Fri, 15 Jan 2021 13:42:31 +0000 (+0100)
Subject: lib/oe/utils: Return empty string in parallel_make
X-Git-Tag: uninative-2.10~212
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2f790ded554a52ac18d1c28002142f9c62abec8b;p=openembedded-core.git

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>
---

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):
     """