summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-24 14:08:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-27 22:30:06 +0100
commit8a93eaad27ec781cd74bb6bb8f78b33fe68101e2 (patch)
tree557f09b87cd8ee077ec467742f6788d023a9686b /meta/conf
parentf512b053b9c69f675ec0c0ccc6c6b95d21db0016 (diff)
downloadpoky-8a93eaad27ec781cd74bb6bb8f78b33fe68101e2.tar.gz
bitbake.conf: Drop usage of build/BUILD_SYS and target/TARGET_SYS conf files
Its been highlighted that TARGET_SYS can be changed by MACHINE and DISTRO files so this doesn't work at all today. build/ configuration files also don't see to be used. Drop these forms of include files for those reasons and simplfy the code slightly. (From OE-Core rev: df61351b625fcd2e86aac7630944cc0403455de6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf2
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 334ba2361f..d4ed894932 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -729,10 +729,8 @@ include conf/site.conf
729include conf/auto.conf 729include conf/auto.conf
730include conf/local.conf 730include conf/local.conf
731require conf/multiconfig/${BB_CURRENT_MC}.conf 731require conf/multiconfig/${BB_CURRENT_MC}.conf
732include conf/build/${BUILD_SYS}.conf
733include conf/machine/${MACHINE}.conf 732include conf/machine/${MACHINE}.conf
734include conf/machine-sdk/${SDKMACHINE}.conf 733include conf/machine-sdk/${SDKMACHINE}.conf
735include conf/target/${TARGET_SYS}.conf
736include conf/distro/${DISTRO}.conf 734include conf/distro/${DISTRO}.conf
737include conf/distro/defaultsetup.conf 735include conf/distro/defaultsetup.conf
738include conf/documentation.conf 736include conf/documentation.conf