summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-20 19:05:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-11 17:21:46 +0000
commitb4f432e3905d70601fcf5fa53e2d30a3c4ea275f (patch)
tree88561430047f263a213f9c965209271f5256a6db
parent6f65543778946334eb9000871f9d42bbd56a45ae (diff)
downloadopenembedded-core-contrib-b4f432e3905d70601fcf5fa53e2d30a3c4ea275f.tar.gz
openembedded-core-contrib-b4f432e3905d70601fcf5fa53e2d30a3c4ea275f.tar.bz2
openembedded-core-contrib-b4f432e3905d70601fcf5fa53e2d30a3c4ea275f.zip
bitbake.conf: Add inclusion of BB_CURRENT_MC.conf after local.conf
People are strugling with multiconfig as the up front inclusion of the configuration file doesn't do what people expect. The only way to meet user expectations is to include the file immediately after local.conf. We add BB_CURRENT_MC to bitbake so that the metadata can determine when to include the extra configuration. (From OE-Core rev: a6a3894fb2cb2097d2404b8b8cb2b85df595cfa9) (From OE-Core rev: 378ba0c92172ed7850ec1b0eb2971afb0dae427b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/bitbake.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9f445bb196..0f27e92e96 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -710,6 +710,7 @@ require conf/abi_version.conf
include conf/site.conf
include conf/auto.conf
include conf/local.conf
+include conf/multiconfig/${BB_CURRENT_MC}.conf
include conf/build/${BUILD_SYS}.conf
include conf/target/${TARGET_SYS}.conf
include conf/machine/${MACHINE}.conf