aboutsummaryrefslogtreecommitdiffstats
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 12:36:40 +0000
commitd8d2f421d673d9988d6db017d0e5c0e9e6b63396 (patch)
tree5e2c558132d726ef14eb55ff2fbc436836a2b280
parent04db2f5238edf77b0ee402f84655c0fe1b5896d4 (diff)
downloadopenembedded-core-contrib-d8d2f421d673d9988d6db017d0e5c0e9e6b63396.tar.gz
openembedded-core-contrib-d8d2f421d673d9988d6db017d0e5c0e9e6b63396.tar.bz2
openembedded-core-contrib-d8d2f421d673d9988d6db017d0e5c0e9e6b63396.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) 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 aee9919badb..7b0ae656bae 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