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>2016-12-22 08:50:21 +0000
commita6a3894fb2cb2097d2404b8b8cb2b85df595cfa9 (patch)
tree160e66fd09df8c4451a8f3deeced7e60358769bf
parent779422c5458f5f643b3a4a0dedaa4d9ad709367a (diff)
downloadopenembedded-core-contrib-a6a3894fb2cb2097d2404b8b8cb2b85df595cfa9.tar.gz
openembedded-core-contrib-a6a3894fb2cb2097d2404b8b8cb2b85df595cfa9.tar.bz2
openembedded-core-contrib-a6a3894fb2cb2097d2404b8b8cb2b85df595cfa9.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. 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 aee9919bad..7b0ae656ba 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -701,6 +701,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