From: Chris Larson <chris_larson@mentor.com>
Date: Thu, 15 Apr 2010 00:56:27 +0000 (-0700)
Subject: bitbake.conf: drop default inclusion of collections.inc
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86957ae707a1f9206ca84792076f176f035ae190;p=openembedded.git

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>
---

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