[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3884/8267] bitbake.conf: Add inclusion of BB_CURRENT_MC.conf after local.conf

[Emmanuele Bassi <ebassi src gnome org>]

commit d8d2f421d673d9988d6db017d0e5c0e9e6b63396
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   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.
    
    (From OE-Core rev: a6a3894fb2cb2097d2404b8b8cb2b85df595cfa9)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/bitbake.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---
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