From: Richard Purdie Date: Tue, 20 Dec 2016 19:05:01 +0000 (+0000) Subject: bitbake.conf: Add inclusion of BB_CURRENT_MC.conf after local.conf X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=378ba0c92172ed7850ec1b0eb2971afb0dae427b;p=openembedded-core.git 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 --- 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