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-21 23:08:16 +0000
commit606500af507046bc62bd2d0a9beab6aec6604a24 (patch)
treee7071c03d3f2b8236ff711de276df59d1cc559d2 /meta/lib
parentb0af7fd0e7353d77be3491da7be9b3424af9e5cf (diff)
downloadpoky-606500af507046bc62bd2d0a9beab6aec6604a24.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: 56638a04899e35278c650da9929541ad7aafd4aa) 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: Steve Sakoman <steve@sakoman.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 13f4271da0..83d298906b 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 """