summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-02-22 02:21:42 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 12:54:20 +0000
commitb33e644da0d8b6edb97257b16430b545c289883a (patch)
treef4f23bfef8b7544691265bad171b5a22a03ca5a0 /meta/conf
parent4aca17e945c51c9ca1fff61c0ef7b512413dea81 (diff)
downloadopenembedded-core-b33e644da0d8b6edb97257b16430b545c289883a.tar.gz
openembedded-core-b33e644da0d8b6edb97257b16430b545c289883a.tar.bz2
openembedded-core-b33e644da0d8b6edb97257b16430b545c289883a.zip
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@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 16235a43d2..ade0eff609 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