summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/hob.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/ui/hob.py')
-rw-r--r--bitbake/lib/bb/ui/hob.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/hob.py b/bitbake/lib/bb/ui/hob.py
index 105b0ef121..72786432bc 100644
--- a/bitbake/lib/bb/ui/hob.py
+++ b/bitbake/lib/bb/ui/hob.py
@@ -962,9 +962,6 @@ class MainWindow (gtk.Window):
962 return scroll 962 return scroll
963 963
964def main (server, eventHandler): 964def main (server, eventHandler):
965 import multiprocessing
966 cpu_cnt = multiprocessing.cpu_count()
967
968 gobject.threads_init() 965 gobject.threads_init()
969 966
970 taskmodel = TaskListModel() 967 taskmodel = TaskListModel()
@@ -979,14 +976,12 @@ def main (server, eventHandler):
979 distro = server.runCommand(["getVariable", "DISTRO"]) 976 distro = server.runCommand(["getVariable", "DISTRO"])
980 bbthread = server.runCommand(["getVariable", "BB_NUMBER_THREADS"]) 977 bbthread = server.runCommand(["getVariable", "BB_NUMBER_THREADS"])
981 if not bbthread: 978 if not bbthread:
982 bbthread = cpu_cnt 979 bbthread = 1
983 handler.set_bbthreads(cpu_cnt)
984 else: 980 else:
985 bbthread = int(bbthread) 981 bbthread = int(bbthread)
986 pmake = server.runCommand(["getVariable", "PARALLEL_MAKE"]) 982 pmake = server.runCommand(["getVariable", "PARALLEL_MAKE"])
987 if not pmake: 983 if not pmake:
988 pmake = cpu_cnt 984 pmake = 1
989 handler.set_pmake(cpu_cnt)
990 else: 985 else:
991 # The PARALLEL_MAKE variable will be of the format: "-j 3" and we only 986 # The PARALLEL_MAKE variable will be of the format: "-j 3" and we only
992 # want a number for the spinner, so strip everything from the variable 987 # want a number for the spinner, so strip everything from the variable
@@ -1012,7 +1007,7 @@ def main (server, eventHandler):
1012 build_headers = bool(server.runCommand(["getVariable", "HOB_BUILD_TOOLCHAIN_HEADERS"])) 1007 build_headers = bool(server.runCommand(["getVariable", "HOB_BUILD_TOOLCHAIN_HEADERS"]))
1013 handler.toggle_toolchain_headers(build_headers) 1008 handler.toggle_toolchain_headers(build_headers)
1014 1009
1015 prefs = HobPrefs(configurator, handler, sdk_mach, distro, pclass, cpu_cnt, 1010 prefs = HobPrefs(configurator, handler, sdk_mach, distro, pclass,
1016 pmake, bbthread, selected_image_types, all_image_types, 1011 pmake, bbthread, selected_image_types, all_image_types,
1017 gplv3disabled, build_toolchain, build_headers) 1012 gplv3disabled, build_toolchain, build_headers)
1018 layers = LayerEditor(configurator, None) 1013 layers = LayerEditor(configurator, None)