aboutsummaryrefslogtreecommitdiffstats
path: root/meta/conf/bitbake.conf
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-10 14:04:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-11 10:48:58 +0100
commitc0a148077ae27a1ef57c55ac22953c68d001af57 (patch)
tree93f3020c90aa9cfeb4f2ac45097fd2b1f402df32 /meta/conf/bitbake.conf
parentb34d5e93fab4274e1a56f446e2ba4756d614cc47 (diff)
downloadopenembedded-core-contrib-c0a148077ae27a1ef57c55ac22953c68d001af57.tar.gz
distro: Add defaultsetup.conf, a set of default configuration providing sane overrridable default for commonly used options
The intent is to allow distros to share common core config but still allow customisations. The core should work with no distro set but users can still customise in any ways needed. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r--meta/conf/bitbake.conf4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index d5338f69e5..7c72de1e29 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -627,10 +627,8 @@ 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/distro/include/default-providers.inc
-include conf/distro/include/default-versions.inc
-include conf/distro/include/world-broken.inc
include conf/distro/${DISTRO}.conf
+include conf/distro/defaultsetup.conf
include conf/documentation.conf
require conf/sanity.conf
require conf/abi_version.conf