From 86957ae707a1f9206ca84792076f176f035ae190 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Wed, 14 Apr 2010 17:56:27 -0700
Subject: 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>
---
 conf/bitbake.conf | 1 -
 1 file changed, 1 deletion(-)

(limited to 'conf/bitbake.conf')

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
-- 
cgit 1.2.3-korg