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 25b8782..47468eb 100644 (file)
--- 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