[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4826/8267] bitbake.conf: fix ineffective include conf/target/${TARGET_SYS}.conf

[Emmanuele Bassi <ebassi src gnome org>]

commit 033b9f70d63698cc46e62611a50b6ee8f2a2c63d
Author: Andre McCurdy <armccurdy gmail com>
Date:   Wed Feb 22 02:21:42 2017 -0800

    bitbake.conf: fix ineffective include conf/target/${TARGET_SYS}.conf
    
    TARGET_SYS is defined in terms of TARGET_ARCH, so it's not valid
    until after TUNE_ARCH has been set by the machine config. The
    original order of includes resulted in an attempt to include
    non-existent files such as:
    
      conf/target/INVALID-oe-linux.conf
    
    (From OE-Core rev: b33e644da0d8b6edb97257b16430b545c289883a)
    
    Signed-off-by: Andre McCurdy <armccurdy gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 16235a4..ade0eff 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -705,9 +705,9 @@ include conf/auto.conf
 include conf/local.conf
 require conf/multiconfig/${BB_CURRENT_MC}.conf
 include conf/build/${BUILD_SYS}.conf
-include conf/target/${TARGET_SYS}.conf
 include conf/machine/${MACHINE}.conf
 include conf/machine-sdk/${SDKMACHINE}.conf
+include conf/target/${TARGET_SYS}.conf
 include conf/distro/${DISTRO}.conf
 include conf/distro/defaultsetup.conf
 include conf/documentation.conf