aboutsummaryrefslogtreecommitdiffstats
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 21:52:22 +0100
commit0db05b39e7cfada6a551cb652a8841c98a9b552d (patch)
treefdbdc5537c637f7c1a8a55af9a329dd42950a327
parent54ddf3fe060715534cd9e23d6e89cf6b06ed3d9f (diff)
downloadopenembedded-core-contrib-0db05b39e7cfada6a551cb652a8841c98a9b552d.tar.gz
openembedded-core-contrib-0db05b39e7cfada6a551cb652a8841c98a9b552d.tar.bz2
openembedded-core-contrib-0db05b39e7cfada6a551cb652a8841c98a9b552d.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>
-rw-r--r--meta/conf/bitbake.conf6
-rw-r--r--meta/conf/local.conf.sample22
-rw-r--r--meta/conf/local.conf.sample.extended23
3 files changed, 29 insertions, 22 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f4870d52a9..135461518c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -698,6 +698,12 @@ IMAGE_ROOTFS_SIZE ?= "65536"
# MACHINE don't change the path to the cache
CACHE := "${CACHE}"
+# Default to setting automatically based on cpu count
+BB_NUMBER_THREADS ?= "${@oe.utils.cpu_count()}"
+
+# Default to setting automatically based on cpu count
+PARALLEL_MAKE ?= "-j ${@oe.utils.cpu_count()}"
+
##################################################################
# Magic Cookie for SANITY CHECK
##################################################################
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index d64ba7f6e5..555f8db1d8 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/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/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended
index b156319163..89b80a6eed 100644
--- a/meta/conf/local.conf.sample.extended
+++ b/meta/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