[oe-commits] [openembedded-core] 35/91: bitbake.conf: fix ineffective include conf/target/${TARGET_SYS}.conf

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

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

commit b33e644da0d8b6edb97257b16430b545c289883a
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: 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
    
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

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