summaryrefslogtreecommitdiff
path: root/conf/bitbake.conf
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-04-14 17:56:27 -0700
committerChris Larson <chris_larson@mentor.com>2010-04-14 18:01:13 -0700
commit86957ae707a1f9206ca84792076f176f035ae190 (patch)
tree4a29473d97823b1f967a1b94d5b2e38714efbe19 /conf/bitbake.conf
parent845da57b03a91d15bb782325358591649df1579c (diff)
bitbake.conf: drop default inclusion of collections.inc
It can interfere with the bblayers stuff in bitbake master. Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'conf/bitbake.conf')
-rw-r--r--conf/bitbake.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 25b87822d4..47468ebcdc 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -677,7 +677,6 @@ OVERRIDES = "local:${MACHINE}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUIL
# Include the rest of the config files.
##################################################################
-require conf/collections.inc
include conf/site.conf
include conf/auto.conf
include conf/local.conf