From a6a3894fb2cb2097d2404b8b8cb2b85df595cfa9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 20 Dec 2016 19:05:01 +0000 Subject: 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 --- meta/conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) 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 -- cgit 1.2.3-korg