diff options
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobprefs.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/hob.py | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobprefs.py b/bitbake/lib/bb/ui/crumbs/hobprefs.py index ee42e58453..3859b29a0f 100644 --- a/bitbake/lib/bb/ui/crumbs/hobprefs.py +++ b/bitbake/lib/bb/ui/crumbs/hobprefs.py | |||
@@ -166,7 +166,7 @@ class HobPrefs(gtk.Dialog): | |||
166 | self.reload_required = False | 166 | self.reload_required = False |
167 | 167 | ||
168 | def __init__(self, configurator, handler, curr_sdk_mach, curr_distro, pclass, | 168 | def __init__(self, configurator, handler, curr_sdk_mach, curr_distro, pclass, |
169 | cpu_cnt, pmake, bbthread, selected_image_types, all_image_types, | 169 | pmake, bbthread, selected_image_types, all_image_types, |
170 | gplv3disabled, build_toolchain, build_toolchain_headers): | 170 | gplv3disabled, build_toolchain, build_toolchain_headers): |
171 | """ | 171 | """ |
172 | """ | 172 | """ |
@@ -185,7 +185,6 @@ class HobPrefs(gtk.Dialog): | |||
185 | self.curr_sdk_mach = curr_sdk_mach | 185 | self.curr_sdk_mach = curr_sdk_mach |
186 | self.curr_distro = curr_distro | 186 | self.curr_distro = curr_distro |
187 | self.curr_package_format = pclass | 187 | self.curr_package_format = pclass |
188 | self.cpu_cnt = cpu_cnt | ||
189 | self.pmake = pmake | 188 | self.pmake = pmake |
190 | self.bbthread = bbthread | 189 | self.bbthread = bbthread |
191 | self.selected_image_types = selected_image_types.split(" ") | 190 | self.selected_image_types = selected_image_types.split(" ") |
@@ -283,7 +282,6 @@ class HobPrefs(gtk.Dialog): | |||
283 | # set a high maximum as a value for upper bounds is required by the | 282 | # set a high maximum as a value for upper bounds is required by the |
284 | # gtk.Adjustment | 283 | # gtk.Adjustment |
285 | spin_max = 30 # seems like a high enough arbitrary number | 284 | spin_max = 30 # seems like a high enough arbitrary number |
286 | #spin_max = self.cpu_cnt * 3 | ||
287 | hbox.pack_start(label, expand=False, fill=False, padding=6) | 285 | hbox.pack_start(label, expand=False, fill=False, padding=6) |
288 | bbadj = gtk.Adjustment(value=self.bbthread, lower=1, upper=spin_max, step_incr=1) | 286 | bbadj = gtk.Adjustment(value=self.bbthread, lower=1, upper=spin_max, step_incr=1) |
289 | bbspinner = gtk.SpinButton(adjustment=bbadj, climb_rate=1, digits=0) | 287 | bbspinner = gtk.SpinButton(adjustment=bbadj, climb_rate=1, digits=0) |
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 | ||
964 | def main (server, eventHandler): | 964 | def 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) |