local.conf.sample: use ?= to assign BB_ENV_EXTRAWHITE variables

Use ?= so that the BB_ENV_EXTRAWHITE variables can be overridden from
the environment.

[YOCTO #4367]

Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 85205c57adb4abbe6e73169223be5776f4c66204..2b078d081e78c9782016231ef595a65e4a93e36f 100644 (file)
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -17,12 +17,12 @@
 # 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"
+#BB_NUMBER_THREADS ?= "4"
 # 
 # The second option controls how many processes make should run in parallel when
 # running compile tasks:
 #
-#PARALLEL_MAKE = "-j 4"
+#PARALLEL_MAKE ?= "-j 4"
 #
 # For a quad-core machine, BB_NUMBER_THREADS = "4", PARALLEL_MAKE = "-j 4" would
 # be appropriate for example.

diff --git a/meta/conf/local.conf.sample.extended b/meta/conf/local.conf.sample.extended
index aad615a4b74197eca7f6f77d9637da957231f327..298211a1c66f1ae72a1bb4bad3af360dd0c55a8a 100644 (file)
--- a/meta/conf/local.conf.sample.extended
+++ b/meta/conf/local.conf.sample.extended
@@ -82,7 +82,7 @@
 # Use "external-MODE" to use the precompiled external toolchains where MODE
 # is the type of external toolchain to use e.g. eabi. You need to ensure 
 # the toolchain you want to use is included in an appropriate layer
-# TCMODE = "external-eabi"
+# TCMODE ?= "external-eabi"
 
 # mklibs library size optimization is more useful to smaller images,
 # and less useful for bigger images. Also mklibs library optimization