[oe-commits] Chris Larson : bitbake.conf: drop default inclusion of collections.inc
git version control
git at git.openembedded.org
Thu Apr 15 05:12:15 UTC 2010
Module: openembedded.git
Branch: shr/unstable
Commit: 86957ae707a1f9206ca84792076f176f035ae190
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=86957ae707a1f9206ca84792076f176f035ae190
Author: Chris Larson <chris_larson at mentor.com>
Date: Wed Apr 14 17:56:27 2010 -0700
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 at mentor.com>
---
conf/bitbake.conf | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 25b8782..47468eb 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
More information about the Openembedded-commits
mailing list