shr: switch to latest stable for gtk+ and glib-2.0

[openembedded.git] / conf / collections.inc

diff --git a/conf/collections.inc b/conf/collections.inc
index 831ca93..0572568 100644 (file)
--- a/conf/collections.inc
+++ b/conf/collections.inc
@@ -10,7 +10,7 @@
 # supported format will be unpacked into COLLECTIONS_UNPACKDIR and used from
 # there.
 
-COLLECTIONS = "${@' '.join(d.getVar('BBPATH', 1).split(':'))}"
+COLLECTIONS ?= "${@' '.join(d.getVar('BBPATH', 1).split(':'))}"
 COLLECTIONS_UNPACKDIR = "${TMPDIR}/collections"
 
 COLLECTIONINFO = "${@get_collection(d.getVar('FILE', 1), d)}"
@@ -166,7 +166,9 @@ def collections_setup(d):
         import sys
         bb.debug(1, "Re-executing bitbake with BBPATH of %s" % d.getVar("BBPATH", 0))
         os.environ["BBPATH"] = d.getVar("BBPATH", 0)
-        os.environ["PYTHONPATH"] = ":".join(sys.path)
+        # FIXME: This exports a bogus PYTHONPATH to OE recipes resulting in massive breakages: 
+        # http://thread.gmane.org/gmane.comp.handhelds.openembedded/30163
+        # os.environ["PYTHONPATH"] = ":".join(sys.path)
         sys.argv.insert(0, sys.executable)
         os.execvpe(sys.executable, sys.argv, os.environ)