summaryrefslogtreecommitdiffstats
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 23:27:08 +0000
commit033b9f70d63698cc46e62611a50b6ee8f2a2c63d (patch)
treee127005722876a2731677c92f6c78241cedb2a9b /meta/conf
parent7e6969bdc9566b5ba25d4ebcd47e03d2f681f223 (diff)
downloadpoky-033b9f70d63698cc46e62611a50b6ee8f2a2c63d.tar.gz
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>
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
705include conf/local.conf 705include conf/local.conf
706require conf/multiconfig/${BB_CURRENT_MC}.conf 706require conf/multiconfig/${BB_CURRENT_MC}.conf
707include conf/build/${BUILD_SYS}.conf 707include conf/build/${BUILD_SYS}.conf
708include conf/target/${TARGET_SYS}.conf
709include conf/machine/${MACHINE}.conf 708include conf/machine/${MACHINE}.conf
710include conf/machine-sdk/${SDKMACHINE}.conf 709include conf/machine-sdk/${SDKMACHINE}.conf
710include conf/target/${TARGET_SYS}.conf
711include conf/distro/${DISTRO}.conf 711include conf/distro/${DISTRO}.conf
712include conf/distro/defaultsetup.conf 712include conf/distro/defaultsetup.conf
713include conf/documentation.conf 713include conf/documentation.conf