summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorRoxana Ciobanu <roxana.ciobanu@intel.com>2014-07-23 10:46:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 22:00:35 +0100
commitf83319541aad03d4499e1d21940e599ec025547d (patch)
treea614354e22c67c308f9a0f2b0ed9d996142a7168 /meta-yocto
parent91c845c452de5ddbf85cf252df874650fb916bdd (diff)
downloadpoky-f83319541aad03d4499e1d21940e599ec025547d.tar.gz
poky-f83319541aad03d4499e1d21940e599ec025547d.tar.bz2
poky-f83319541aad03d4499e1d21940e599ec025547d.zip
bitbake.conf: move BB_NUMBER_THREADS and PARALLEL_MAKE to bitbake.conf
Currently, BB_NUMBER_THREADS and PARALLEL_MAKE default to unset and are set in local.conf. Now that we have the automatic probing, the default values can be set in bitbake.conf and an example of explicitly defining how many tasks to run can be moved to local.conf.sample.extended. [YOCTO #6217] Signed-off-by: Roxana Ciobanu <roxana.ciobanu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/local.conf.sample22
-rw-r--r--meta-yocto/conf/local.conf.sample.extended23
2 files changed, 23 insertions, 22 deletions
diff --git a/meta-yocto/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index bcb086481c..da4a01e95c 100644
--- a/meta-yocto/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
@@ -12,28 +12,6 @@
# variable as required.
#
-# Parallelism Options
-#
-# These two options control how much parallelism BitBake should use. The first
-# option determines how many tasks bitbake should run in parallel:
-#
-#BB_NUMBER_THREADS ?= "4"
-#
-# Default to setting automatically based on cpu count
-BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}"
-#
-# The second option controls how many processes make should run in parallel when
-# running compile tasks:
-#
-#PARALLEL_MAKE ?= "-j 4"
-#
-# Default to setting automatically based on cpu count
-PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
-#
-# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
-# be appropriate for example.
-
-#
# Machine Selection
#
# You need to select a specific machine to target the build with. There are a selection
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index b156319163..89b80a6eed 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -2,6 +2,29 @@
# certain recipes.
#BBMASK = ""
+#
+# Parallelism Options
+#
+# These two options control how much parallelism BitBake should use. The first
+# option determines how many tasks bitbake should run in parallel:
+#
+#BB_NUMBER_THREADS ?= "4"
+#
+# Default to setting automatically based on cpu count
+#BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}"
+#
+# The second option controls how many processes make should run in parallel when
+# running compile tasks:
+#
+#PARALLEL_MAKE ?= "-j 4"
+#
+# Default to setting automatically based on cpu count
+#PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
+#
+# For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
+# be appropriate for example.
+
+
# eglibc configurability is used to reduce minimal image's size.
# the all supported eglibc options are listed in DISTRO_FEATURES_LIBC
# and disabled by default. Uncomment and copy the DISTRO_FEATURES_LIBC