diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2017-02-22 02:21:42 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-01 23:27:08 +0000 |
commit | 033b9f70d63698cc46e62611a50b6ee8f2a2c63d (patch) | |
tree | e127005722876a2731677c92f6c78241cedb2a9b /meta/conf | |
parent | 7e6969bdc9566b5ba25d4ebcd47e03d2f681f223 (diff) | |
download | poky-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.conf | 2 |
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 | |||
705 | include conf/local.conf | 705 | include conf/local.conf |
706 | require conf/multiconfig/${BB_CURRENT_MC}.conf | 706 | require conf/multiconfig/${BB_CURRENT_MC}.conf |
707 | include conf/build/${BUILD_SYS}.conf | 707 | include conf/build/${BUILD_SYS}.conf |
708 | include conf/target/${TARGET_SYS}.conf | ||
709 | include conf/machine/${MACHINE}.conf | 708 | include conf/machine/${MACHINE}.conf |
710 | include conf/machine-sdk/${SDKMACHINE}.conf | 709 | include conf/machine-sdk/${SDKMACHINE}.conf |
710 | include conf/target/${TARGET_SYS}.conf | ||
711 | include conf/distro/${DISTRO}.conf | 711 | include conf/distro/${DISTRO}.conf |
712 | include conf/distro/defaultsetup.conf | 712 | include conf/distro/defaultsetup.conf |
713 | include conf/documentation.conf | 713 | include conf/documentation.conf |