Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev

6 files changed, 73 insertions, 40 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e42c704bd5..d8392d1507 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11462,6 +11462,10 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d
 md5=b4f7ffcc294d41a6a4c40d6e44b7734d
 sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38
 
+[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.0.tar.gz]
+md5=bf87c53f36b4454ad3cc50aa9c72faf3
+sha256=f8244b8c4691faf0c9765ec3acba730a5620c8077f9bed667b9ac835dd959ba2
+
 [http://projects.linuxtogo.org/frs/download.php/221/kexecboot-0.3.tar.gz]
 md5=3c3b8edb739146183b3ddff3e0af5f1c
 sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96
@@ -23186,7 +23190,7 @@ sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
 md5=b2c104938c1c3eb47e7605432bbd3157
 sha256=c750c8180057385eaa0844f1148d6f0223b986da322773195eab44b33b97c19f
 
-[http://uim.freedesktop.org/releases/uim/stable/uim-1.3.1.tar.bz2]
+[http://uim.googlecode.com/files/uim-1.3.1.tar.bz2]
 md5=2832e23d4778bbacbfa4b49bf642d667
 sha256=ed2cfa15018a4fd2557e875f66fcb3f0b9dabe12fa0700aa2f11cca69c2cb256
 
diff --git a/conf/collections.inc b/conf/collections.inc
index abd9bd383b..0ef6e75ca9 100644
--- a/conf/collections.inc
+++ b/conf/collections.inc
@@ -1,9 +1,6 @@
 # Take a list of directories in COLLECTIONS, in priority order (highest to
 # lowest), and use those to populate BBFILES, BBFILE_COLLECTIONS,
-# BBFILE_PATTERN_*, and BBFILE_PRIORITY_*.  By default, COLLECTIONS is
-# prepopulated with the locations the user specified in their BBPATH.
-# Note that it will not overwrite existing BBFILES or BBFILE_* variables, so
-# you'll need to remove those from your config in order to use this.
+# BBFILE_PATTERN_*, and BBFILE_PRIORITY_*.
 #
 # Specifying an archive in COLLECTIONS is also supported.  Any archives of a
 # supported format will be unpacked into COLLECTIONS_UNPACKDIR and used from
@@ -44,8 +41,8 @@ def collection_unpack(collection, name, d):
             pass
         else:
             if oldmd5sum == md5sum:
-                bb.debug(1, "Using existing %s for collection %s" % (outpath, name))
-                return outpath
+                bb.note("Using existing %s for collection '%s'" % (outpath, name))
+                return outpath, False
 
         bb.note("Removing old unpacked collection at %s" % outpath)
         os.system("rm -rf %s" % outpath)
@@ -69,7 +66,7 @@ def collection_unpack(collection, name, d):
     md5out = open(md5file, "w")
     md5out.write(md5sum)
     md5out.close()
-    return outpath
+    return outpath, True
 
 def collections_setup(d):
     """ Populate collection and bbfiles metadata from the COLLECTIONS var. """
@@ -85,21 +82,30 @@ def collections_setup(d):
     collections = d.getVar("COLLECTIONS", 1)
     if not collections:
         return
-    globbed = (glob(path) for path in collections.split())
-    collections = list(chain(*globbed))
+
+    bb.debug(1, "Processing COLLECTIONS (%s)" % collections)
+
+    globbed = []
+    for path in collections.split():
+        paths = glob(os.path.normpath(path))
+        if not paths:
+            bb.msg.warn(None, "No matches in filesystem for %s in COLLECTIONS" % path)
+        globbed += paths
+    collections = globbed
 
     collectionmap = {}
     namemap = {}
     for collection in collections:
-        if collection.endswith(os.sep):
-            collection = collection[:-1]
         basename = os.path.basename(collection).split(os.path.extsep)[0]
         if namemap.get(basename):
             basename = "%s-%s" % (basename, hash(collection))
         namemap[basename] = collection
         collectionmap[collection] = basename
 
-    for (collection, priority) in izip(collectionmap, xrange(len(collections), 0, -1)):
+    unpackedthisexec = False
+    oldbbpath = d.getVar("BBPATH", 1)
+    bbpath = (oldbbpath or "").split(":")
+    for (collection, priority) in izip(collections, xrange(len(collections), 0, -1)):
         if not os.path.exists(collection):
             bb.fatal("Collection %s does not exist" % collection)
 
@@ -109,12 +115,18 @@ def collections_setup(d):
 
         if not os.path.isdir(collection):
             del collectionmap[collection]
-            unpacked = collection_unpack(collection, name, d)
+            unpacked, unpackedthisexec = collection_unpack(collection, name, d)
             if unpacked:
                 collection = unpacked
                 collectionmap[collection] = name
+                for dir in glob("%s/*/" % collection):
+                    if not dir in bbpath:
+                        bbpath.append(dir)
             else:
                 bb.fatal("Unable to unpack collection %s" % collection)
+        else:
+            if not collection in bbpath:
+                bbpath.append(collection)
 
         setifunset("BBFILE_PATTERN_%s" % name, "^%s/" % collection)
         setifunset("BBFILE_PRIORITY_%s" % name, str(priority))
@@ -122,6 +134,21 @@ def collections_setup(d):
     setifunset("BBFILE_COLLECTIONS", " ".join(collectionmap.values()))
     setifunset("BBFILES", " ".join(collectionmap.keys()))
 
+    # Strip out the fallback bitbake.conf from BB_RUN_LOCATION
+    bbpath = [os.path.realpath(dir) for dir in bbpath if os.path.exists(dir)]
+    try:
+        bbpath.remove(os.path.realpath(bb.data.expand("${BB_RUN_LOCATION}/../share/bitbake", d)))
+    except (OSError, ValueError):
+        pass
+
+    from sets import Set
+    d.setVar("BBPATH", ":".join(bbpath))
+    if unpackedthisexec or Set(bbpath).symmetric_difference(Set(oldbbpath.split(":"))):
+        bb.debug(1, "Re-executing bitbake with BBPATH of %s" % d.getVar("BBPATH", 0))
+        import sys
+        os.environ["BBPATH"] = d.getVar("BBPATH", 0)
+        os.execvpe("bitbake", sys.argv, os.environ)
+
 addhandler collections_eh
 python collections_eh () {
     from bb.event import getName
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 8be99a363d..1be3dabc2b 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -39,6 +39,7 @@ SRCDATE_python-cairo ?= "20060814"
 SRCDATE_qemu-native ?= "20070613"
 SRCDATE_rdesktop ?= "20080917"
 SRCDATE_roadster ?= "20060814"
+SRCDATE_rosetta ?= "20090514"
 SRCDATE_sctzap ?= "20060814"
 SRCDATE_tslib ?= "20051101"
 SRCDATE_waimea ?= "20060814"
diff --git a/conf/machine/afeb9260-180.conf b/conf/machine/afeb9260-180.conf
new file mode 100644
index 0000000000..9c819310a1
--- /dev/null
+++ b/conf/machine/afeb9260-180.conf
@@ -0,0 +1,2 @@
+include conf/machine/include/afeb9260.inc
+
diff --git a/conf/machine/afeb9260.conf b/conf/machine/afeb9260.conf
index dc85cce102..32c87e16bc 100644
--- a/conf/machine/afeb9260.conf
+++ b/conf/machine/afeb9260.conf
@@ -1,26 +1 @@
-#@TYPE: Machine
-#@Name: Atmel AT91SAM9260EK Development Platform
-#@DESCRIPTION: Machine.inciguration for the at91sam9260ek development board with a at91sam9260 processor
-
-TARGET_ARCH = "arm"
-#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
-
-KERNEL_IMAGETYPE = "uImage"
-
-#don't try to access tty1
-USE_VT = "0"
-
-MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
-EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
-
-# used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttyS0"
-IMAGE_FSTYPES ?= "jffs2"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
-
-require conf/machine/include/tune-arm926ejs.inc
-
+include conf/machine/include/afeb9260.inc
diff --git a/conf/machine/include/afeb9260.inc b/conf/machine/include/afeb9260.inc
new file mode 100644
index 0000000000..cb3ff9bbe9
--- /dev/null
+++ b/conf/machine/include/afeb9260.inc
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@Name: AFEB9260 development board http://www.oshw.ru/
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+EXTRA_IMAGEDEPENDS += "at91bootstrap u-boot"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc