[oe-commits] [openembedded-core] 02/04: bitbake.conf: Add inclusion of BB_CURRENT_MC.conf after local.conf

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit d5bc0e4ebdcc9df5b006cd9b85df73ac21ca335a
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Tue Dec 20 19:05:01 2016 +0000

    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 at linuxfoundation.org>
---
 meta/conf/bitbake.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index aee9919..7b0ae65 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.