gcc: Fix volatile access issue for ARM

[YOCTO #1130]

This patch brings in a patch from gcc for the following issue:

http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html

(From OE-Core rev: 347c30801b6f935a6aefa5578d723a8afcf52790)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

.gitignore

@@ -7,31 +7,16 @@ build/tmp/
 build/sstate-cache
 build/pyshtables.py
 pstage/
-scripts/poky-git-proxy-socks
+scripts/oe-git-proxy-socks
 sources/
 meta-darwin
 meta-maemo
 meta-extras
 meta-m2
 meta-prvt*
-poky-autobuilder*
 *.swp
 *.orig
 *.rej
 *~
-documentation/poky-ref-manual/poky-ref-manual.html
-documentation/poky-ref-manual/poky-ref-manual.pdf
-documentation/poky-ref-manual/poky-ref-manual.tgz
-documentation/poky-ref-manual/bsp-guide.html
-documentation/poky-ref-manual/bsp-guide.pdf
-documentation/bsp-guide/bsp-guide.html
-documentation/bsp-guide/bsp-guide.pdf
-documentation/bsp-guide/bsp-guide.tgz
-documentation/yocto-project-qs/yocto-project-qs.html
-documentation/yocto-project-qs/yocto-project-qs.tgz
-documentation/kernel-manual/kernel-manual.html
-documentation/kernel-manual/kernel-manual.tgz
-documentation/kernel-manual/kernel-manual.pdf
-
 
 

README

@@ -1,15 +1,25 @@
 Poky
 ====
 
-Poky platform builder is a combined cross build system and development 
-environment. It features support for building X11/Matchbox/GTK based 
-filesystem images for various embedded devices and boards. It also 
-supports cross-architecture application development using QEMU emulation
-and a standalone toolchain and SDK with IDE integration.
-
-Poky has an extensive handbook, the source of which is contained in
-the handbook directory. For compiled HTML or pdf versions of this, 
-see the Poky website http://pokylinux.org.
+Poky is an integration of various components to form a complete prepackaged
+build system and development environment. It features support for building
+customised embedded device style images. There are reference demo images
+featuring a X11/Matchbox/GTK themed UI called Sato. The system supports
+cross-architecture application development using QEMU emulation and a
+standalone toolchain and SDK with IDE integration.
 
 Additional information on the specifics of hardware that Poky supports
-is available in README.hardware.
+is available in README.hardware. Further hardware support can easily be added
+in the form of layers which extend the systems capabilities in a modular way.
+
+As an integration layer Poky consists of several upstream projects such as 
+BitBake, OpenEmbedded-Core, Yocto documentation and various sources of information 
+e.g. for the hardware support. Poky is in turn a component of the Yocto Project.
+
+The Yocto Project has extensive documentation about the system including a 
+reference manual which can be found at:
+    http://yoctoproject.org/community/documentation
+
+For information about OpenEmbedded see their website:
+    http://www.openembedded.org/
+

README.hardware

@@ -87,22 +87,22 @@ Hard Disk:
   1. Build a directdisk image format. This will generate proper partition tables
      that will in turn be written to the physical media. For example:
 
-     $ bitbake poky-image-minimal-directdisk
+     $ bitbake core-image-minimal-directdisk
   
   2. Use the "dd" utility to write the image to the raw block device. For example:
 
-     # dd if=poky-image-minimal-directdisk-atom-pc.hdddirect of=/dev/sdb
+     # dd if=core-image-minimal-directdisk-atom-pc.hdddirect of=/dev/sdb
 
 USB Device:
   1. Build an hddimg image format. This is a simple filesystem without partition
      tables and is suitable for USB keys. For example:
 
-     $ bitbake poky-image-minimal-live
+     $ bitbake core-image-minimal-live
 
   2. Use the "dd" utility to write the image to the raw block device. For
      example:
 
-     # dd if=poky-image-minimal-live-atom-pc.hddimg of=/dev/sdb
+     # dd if=core-image-minimal-live-atom-pc.hddimg of=/dev/sdb
 
   If the device fails to boot with "Boot error" displayed, it is likely the BIOS
   cannot understand the physical layout of the disk (or rather it expects a
@@ -126,7 +126,7 @@ USB Device:
 
      b. Copy the contents of the poky image to the USB-ZIP mode device:
 
-     # mount -o loop poky-image-minimal-live-atom-pc.hddimg  /tmp/image
+     # mount -o loop core-image-minimal-live-atom-pc.hddimg  /tmp/image
      # mount /dev/sdb4 /tmp/usbkey
      # cp -rf /tmp/image/* /tmp/usbkey
 
@@ -149,26 +149,15 @@ The Beagleboard is an ARM Cortex-A8 development board with USB, DVI-D, S-Video,
 faster CPU, more RAM, an ethernet port, more USB ports, microSD, and removes
 the NAND flash. The beagleboard MACHINE is tested on the following platforms:
 
-  o Beagleboard C4
-  o Beagleboard xM Rev A
+  o Beagleboard xM
 
-The Beagleboard C4 has NAND, while the xM does not. For the sake of simplicity,
-these instructions assume you have erased the NAND on the C4 so its boot
-behavior matches that of the xM. To do this, issue the following commands from
-the u-boot prompt (note that the unlock may be unecessary depending on the
-version of u-boot installed on your board and only one of the erase commands
-will succeed):
+TODO: need someone with a Beagleboard C4 to verify these instructions.
 
-    # nand unlock
-    # nand erase
-    # nand erase.chip
-
-To further tailor these instructions for your board, please refer to the
-documentation at http://www.beagleboard.org.
-
-From a Linux system with access to the image files perform the following steps
-as root, replacing mmcblk0* with the SD card device on your machine (such as sdc
-if used via a usb card reader):
+Due to the lack of NAND on the xM, the install and boot process varies a bit
+between boards.  The C4 can run the x-loader and u-boot binaries from NAND or
+the SD, while the xM can only run them from the SD. The following instructions
+apply to both the C4 and the xM, but the C4 can skip step 2 (as noted below),
+and may require modification of the NAND environment.
 
   1. Partition and format an SD card:
      # fdisk -lu /dev/mmcblk0
@@ -184,19 +173,19 @@ if used via a usb card reader):
      # mkfs.vfat -F 16 -n "boot" /dev/mmcblk0p1
      # mke2fs -j -L "root" /dev/mmcblk0p2
 
-  The following assumes the SD card partition 1 and 2 are mounted at
-  /media/boot and /media/root respectively. Removing the card and reinserting
-  it will do just that on most modern Linux desktop environments.
-  
-  The files referenced below are made available after the build in
-  build/tmp/deploy/images.
+   The following assumes the SD card partition 1 and 2 are mounted at
+   /media/boot and /media/root respectively. The files referenced here
+   are made available after the build in build/tmp/deploy/images.
 
   2. Install the boot loaders
+     This step can be omitted for the C4 as it can have the x-loader and
+     u-boot installed in NAND.
+
      # cp MLO-beagleboard /media/boot/MLO
      # cp u-boot-beagleboard.bin /media/boot/u-boot.bin
 
   3. Install the root filesystem
-     # tar x -C /media/root -f poky-image-$IMAGE_TYPE-beagleboard.tar.bz2
+     # tar x -C /media/root -f core-image-$IMAGE_TYPE-beagleboard.tar.bz2
      # tar x -C /media/root -f modules-$KERNEL_VERSION-beagleboard.tgz
 
   4. Install the kernel uImage
@@ -216,15 +205,14 @@ if used via a usb card reader):
      boot
      EOF
      ) > serial-boot.cmd
-     # mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Core Minimal" -d ./serial-boot.cmd ./boot.scr
+     # mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Poky Minimal" -d ./serial-boot.cmd ./boot.scr
      # cp boot.scr /media/boot
 
-   6. Unmount the SD partitions, insert the SD card into the Beagleboard, and
-      boot the Beagleboard
+   6. Unmount the SD partitions and boot the Beagleboard
 
 Note: As of the 2.6.37 linux-yocto kernel recipe, the Beagleboard uses the
       OMAP_SERIAL device (ttyO2). If you are using an older kernel, such as the
-      2.6.34 linux-yocto-stable, be sure to replace ttyO2 with ttyS2 above. You
+      2.6.35 linux-yocto-stable, be sure replace ttyO2 with ttyS2 above. You
       should also override the machine SERIAL_CONSOLE in your local.conf in
       order to setup the getty on the serial line:
 
@@ -291,11 +279,11 @@ name in all commands where appropriate.
 
 --- Preparation ---
 
-1) Build an image (e.g. poky-image-minimal) using "routerstationpro" as the
+1) Build an image (e.g. core-image-minimal) using "routerstationpro" as the
 MACHINE
 
 2) Partition the USB drive so that primary partition 1 is type Linux (83).
-Minimum size depends on your root image size - poky-image-minimal probably
+Minimum size depends on your root image size - core-image-minimal probably
 only needs 8-16MB, other images will need more.
 
   # fdisk /dev/sdb
@@ -316,11 +304,11 @@ only needs 8-16MB, other images will need more.
   # mke2fs -j /dev/sdb1
 
 4) Mount partition 1 and then extract the contents of
-tmp/deploy/images/poky-image-XXXX.tar.bz2 into it (preserving permissions).
+tmp/deploy/images/core-image-XXXX.tar.bz2 into it (preserving permissions).
 
   # mount /dev/sdb1 /media/sdb1
   # cd /media/sdb1
-  # tar -xvjpf tmp/deploy/images/poky-image-XXXX.tar.bz2
+  # tar -xvjpf tmp/deploy/images/core-image-XXXX.tar.bz2
 
 5) Unmount the USB drive and then plug it into the board's USB port
 

bitbake/doc/manual/usermanual.xml

@@ -261,11 +261,11 @@ SRC_URI_append_1.0.7+ = "file://some_patch_which_the_new_versions_need.patch;pat
             </section>
             <section>
                 <title>Recursive DEPENDS</title>
-                <para>These are specified with the 'recdeptask' flag and is used signify the task(s) of each DEPENDS which must have completed before that task can be executed. It applies recursively so also, the DEPENDS of each item in the original DEPENDS must be met and so on.</para>
+                <para>These are specified with the 'recdeptask' flag and is used to signify the task(s) of each DEPENDS which must have completed before that task can be executed. It applies recursively so also, the DEPENDS of each item in the original DEPENDS must be met and so on.</para>
             </section>
             <section>
                 <title>Recursive RDEPENDS</title>
-                <para>These are specified with the 'recrdeptask' flag and is used signify the task(s) of each RDEPENDS which must have completed before that task can be executed. It applies recursively so also, the RDEPENDS of each item in the original RDEPENDS must be met and so on. It also runs all DEPENDS first too.</para>
+                <para>These are specified with the 'recrdeptask' flag and is used to signify the task(s) of each RDEPENDS which must have completed before that task can be executed. It applies recursively so also, the RDEPENDS of each item in the original RDEPENDS must be met and so on. It also runs all DEPENDS first too.</para>
             </section>
             <section>
                 <title>Inter Task</title>

bitbake/lib/bb/build.py

@@ -32,7 +32,7 @@ import bb
 import bb.msg
 import bb.process
 from contextlib import nested
-from bb import data, event, mkdirhier, utils
+from bb import data, event, utils
 
 bblogger = logging.getLogger('BitBake')
 logger = logging.getLogger('BitBake.Build')
@@ -162,6 +162,7 @@ def exec_func(func, d, dirs = None):
         lockfiles = None
 
     tempdir = data.getVar('T', d, 1)
+    bb.utils.mkdirhier(tempdir)
     runfile = os.path.join(tempdir, 'run.{0}.{1}'.format(func, os.getpid()))
 
     with bb.utils.fileslocked(lockfiles):
@@ -181,16 +182,16 @@ def exec_func_python(func, d, runfile, cwd=None):
     """Execute a python BB 'function'"""
 
     bbfile = d.getVar('FILE', True)
-    try:
-        olddir = os.getcwd()
-    except OSError:
-        olddir = None
     code = _functionfmt.format(function=func, body=d.getVar(func, True))
     bb.utils.mkdirhier(os.path.dirname(runfile))
     with open(runfile, 'w') as script:
         script.write(code)
 
     if cwd:
+        try:
+            olddir = os.getcwd()
+        except OSError:
+            olddir = None
         os.chdir(cwd)
 
     try:
@@ -202,8 +203,11 @@ def exec_func_python(func, d, runfile, cwd=None):
 
         raise FuncFailed(func, None)
     finally:
-        if olddir:
-            os.chdir(olddir)
+        if cwd and olddir:
+            try:
+                os.chdir(olddir)
+            except OSError:
+                pass
 
 def exec_func_shell(function, d, runfile, cwd=None):
     """Execute a shell function from the metadata
@@ -224,7 +228,8 @@ def exec_func_shell(function, d, runfile, cwd=None):
         if cwd:
             script.write("cd %s\n" % cwd)
         script.write("%s\n" % function)
-        os.fchmod(script.fileno(), 0775)
+
+    os.chmod(runfile, 0775)
 
     env = {
         'PATH': d.getVar('PATH', True),

bitbake/lib/bb/cache.py

@@ -129,7 +129,10 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)):
     @classmethod
     def from_metadata(cls, filename, metadata):
         if cls.getvar('__SKIPPED', metadata):
-            return cls.make_optional(skipped=True)
+            return cls.make_optional(skipped=True,
+                                     file_depends=metadata.getVar('__depends', False),
+                                     timestamp=bb.parse.cached_mtime(filename),
+                                     variants=cls.listvar('__VARIANTS', metadata) + [''])
 
         tasks = metadata.getVar('__BBTASKS', False)
 
@@ -294,6 +297,7 @@ class Cache(object):
 
         logger.debug(1, "Parsing %s (full)", fn)
 
+        cfgData.setVar("__ONLYFINALISE", virtual or "default")
         bb_data = cls.load_bbfile(fn, appends, cfgData)
         return bb_data[virtual]
 
@@ -479,11 +483,13 @@ class Cache(object):
         return bb.parse.cached_mtime_noerror(cachefile)
 
     def add_info(self, filename, info, cacheData, parsed=None):
-        cacheData.add_from_recipeinfo(filename, info)
+        if not info.skipped:
+            cacheData.add_from_recipeinfo(filename, info)
+
         if not self.has_cache:
             return
 
-        if 'SRCREVINACTION' not in info.pv and not info.nocache:
+        if (info.skipped or 'SRCREVINACTION' not in info.pv) and not info.nocache:
             if parsed:
                 self.cacheclean = False
             self.depends_cache[filename] = info
@@ -566,6 +572,7 @@ class CacheData(object):
         self.packages = defaultdict(list)
         self.packages_dynamic = defaultdict(list)
         self.possible_world = []
+        self.universe_target = []
         self.pkg_pn = defaultdict(list)
         self.pkg_fn = {}
         self.pkg_pepvpr = {}
@@ -644,6 +651,11 @@ class CacheData(object):
         if not info.broken and not info.not_world:
             self.possible_world.append(fn)
 
+        # create a collection of all targets for sanity checking
+        # tasks, such as upstream versions, license, and tools for
+        # task and image creation.
+        self.universe_target.append(info.pn)
+
         self.hashfn[fn] = info.hashfilename
         for task, taskhash in info.basetaskhashes.iteritems():
             identifier = '%s.%s' % (fn, task)

bitbake/lib/bb/codeparser.py

@@ -21,13 +21,13 @@ def check_indent(codestr):
     """If the code is indented, add a top level piece of code to 'remove' the indentation"""
 
     i = 0
-    while codestr[i] in ["\n", "	", " "]:
+    while codestr[i] in ["\n", "\t", " "]:
         i = i + 1
 
     if i == 0:
         return codestr
 
-    if codestr[i-1] is "	" or codestr[i-1] is " ":
+    if codestr[i-1] == "\t" or codestr[i-1] == " ":
         return "if 1:\n" + codestr
 
     return codestr
@@ -70,8 +70,25 @@ def parser_cache_save(d):
     if not cachefile:
         return
 
+    lf = bb.utils.lockfile(cachefile + ".lock")
+
+    try:
+        p = pickle.Unpickler(file(cachefile, "rb"))
+        data, version = p.load()
+    except IOError, EOFError:
+        data, version = None, None
+
+    if version == PARSERCACHE_VERSION:
+        for h in data[0]:
+            if h not in pythonparsecache:
+                pythonparsecache[h] = data[0][h]
+        for h in data[1]:
+            if h not in pythonparsecache:
+                shellparsecache[h] = data[1][h]
+
     p = pickle.Pickler(file(cachefile, "wb"), -1)
     p.dump([[pythonparsecache, shellparsecache], PARSERCACHE_VERSION])
+    bb.utils.unlockfile(lf)
 
 class PythonParser():
     class ValueVisitor():

bitbake/lib/bb/compat.py

@@ -0,0 +1,28 @@
+"""Code pulled from future python versions, here for compatibility"""
+
+def total_ordering(cls):
+    """Class decorator that fills in missing ordering methods"""
+    convert = {
+        '__lt__': [('__gt__', lambda self, other: other < self),
+                   ('__le__', lambda self, other: not other < self),
+                   ('__ge__', lambda self, other: not self < other)],
+        '__le__': [('__ge__', lambda self, other: other <= self),
+                   ('__lt__', lambda self, other: not other <= self),
+                   ('__gt__', lambda self, other: not self <= other)],
+        '__gt__': [('__lt__', lambda self, other: other > self),
+                   ('__ge__', lambda self, other: not other > self),
+                   ('__le__', lambda self, other: not self > other)],
+        '__ge__': [('__le__', lambda self, other: other >= self),
+                   ('__gt__', lambda self, other: not other >= self),
+                   ('__lt__', lambda self, other: not self >= other)]
+    }
+    roots = set(dir(cls)) & set(convert)
+    if not roots:
+        raise ValueError('must define at least one ordering operation: < > <= >=')
+    root = max(roots)       # prefer __lt__ to __le__ to __gt__ to __ge__
+    for opname, opfunc in convert[root]:
+        if opname not in roots:
+            opfunc.__name__ = opname
+            opfunc.__doc__ = getattr(int, opname).__doc__
+            setattr(cls, opname, opfunc)
+    return cls

bitbake/lib/bb/cooker.py

@@ -124,6 +124,8 @@ class BBCooker:
 
             if 'world' in self.configuration.pkgs_to_build:
                 buildlog.error("'world' is not a valid target for --environment.")
+            if 'universe' in self.configuration.pkgs_to_build:
+                buildlog.error("'universe' is not a valid target for --environment.")
             elif len(self.configuration.pkgs_to_build) > 1:
                 buildlog.error("Only one target can be used with the --environment option.")
             elif self.configuration.buildfile and len(self.configuration.pkgs_to_build) > 0:
@@ -705,20 +707,23 @@ class BBCooker:
         if (task == None):
             task = self.configuration.cmd
 
-        (fn, cls) = bb.cache.Cache.virtualfn2realfn(buildfile)
+        fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile)
+        fn = os.path.abspath(fn)
         buildfile = self.matchFile(fn)
-        fn = bb.cache.Cache.realfn2virtual(buildfile, cls)
 
         self.buildSetVars()
 
         self.status = bb.cache.CacheData()
         infos = bb.cache.Cache.parse(fn, self.get_file_appends(fn), \
                                      self.configuration.data)
-        maininfo = None
-        for vfn, info in infos:
-            self.status.add_from_recipeinfo(vfn, info)
-            if vfn == fn:
-                maininfo = info
+        infos = dict(infos)
+
+        fn = bb.cache.Cache.realfn2virtual(buildfile, cls)
+        try:
+            maininfo = infos[fn]
+        except KeyError:
+            bb.fatal("%s does not exist" % fn)
+        self.status.add_from_recipeinfo(fn, maininfo)
 
         # Tweak some variables
         item = maininfo.pn
@@ -889,6 +894,12 @@ class BBCooker:
             for t in self.status.world_target:
                 pkgs_to_build.append(t)
 
+        if 'universe' in pkgs_to_build:
+            parselog.debug(1, "collating packages for \"universe\"")
+            pkgs_to_build.remove('universe')
+            for t in self.status.universe_target:
+                pkgs_to_build.append(t)
+
         return pkgs_to_build
 
     def get_bbfiles( self, path = os.getcwd() ):
@@ -930,16 +941,21 @@ class BBCooker:
             collectlog.error("no recipe files to build, check your BBPATH and BBFILES?")
             bb.event.fire(CookerExit(), self.configuration.event_data)
 
-        newfiles = set()
+        # Can't use set here as order is important
+        newfiles = []
         for f in files:
             if os.path.isdir(f):
                 dirfiles = self.find_bbfiles(f)
-                newfiles.update(dirfiles)
+                for g in dirfiles:
+                    if g not in newfiles:
+                        newfiles.append(g)
             else:
                 globbed = glob.glob(f)
                 if not globbed and os.path.exists(f):
                     globbed = [f]
-                newfiles.update(globbed)
+                for g in globbed:
+                    if g not in newfiles:
+                        newfiles.append(g)
 
         bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1)
 
@@ -1104,6 +1120,7 @@ class CookerParser(object):
     def start(self):
         def init(cfg):
             signal.signal(signal.SIGINT, signal.SIG_IGN)
+            multiprocessing.util.Finalize(None, bb.codeparser.parser_cache_save, args=(self.cooker.configuration.data, ), exitpriority=1)
             parse_file.cfg = cfg
 
         bb.event.fire(bb.event.ParseStarted(self.toparse), self.cfgdata)
@@ -1129,10 +1146,6 @@ class CookerParser(object):
         sync.start()
         atexit.register(lambda: sync.join())
 
-        codesync = threading.Thread(target=bb.codeparser.parser_cache_save(self.cooker.configuration.data))
-        codesync.start()
-        atexit.register(lambda: codesync.join())
-
     def load_cached(self):
         for filename, appends in self.fromcache:
             cached, infos = self.bb_cache.load(filename, appends, self.cfgdata)
@@ -1164,8 +1177,7 @@ class CookerParser(object):
         for virtualfn, info in result:
             if info.skipped:
                 self.skipped += 1
-            else:
-                self.bb_cache.add_info(virtualfn, info, self.cooker.status,
+            self.bb_cache.add_info(virtualfn, info, self.cooker.status,
                                         parsed=parsed)
         return True
 

bitbake/lib/bb/data_smart.py

@@ -191,11 +191,11 @@ class DataSmart(MutableMapping):
                             keep.append((a ,o))
                             continue
 
-                        if op is "_append":
+                        if op == "_append":
                             sval = self.getVar(append, False) or ""
                             sval += a
                             self.setVar(append, sval)
-                        elif op is "_prepend":
+                        elif op == "_prepend":
                             sval = a + (self.getVar(append, False) or "")
                             self.setVar(append, sval)
 

bitbake/lib/bb/event.py

@@ -37,6 +37,8 @@ import bb.utils
 worker_pid = 0
 worker_pipe = None
 
+logger = logging.getLogger('BitBake.Event')
+
 class Event(object):
     """Base class for events"""
 
@@ -58,23 +60,35 @@ _ui_handler_seq = 0
 bb.utils._context["NotHandled"] = NotHandled
 bb.utils._context["Handled"] = Handled
 
+def execute_handler(name, handler, event, d):
+    event.data = d
+    try:
+        ret = handler(event)
+    except Exception:
+        etype, value, tb = sys.exc_info()
+        logger.error("Execution of event handler '%s' failed" % name,
+                        exc_info=(etype, value, tb.tb_next))
+        raise
+    except SystemExit as exc:
+        if exc.code != 0:
+            logger.error("Execution of event handler '%s' failed" % name)
+        raise
+    finally:
+        del event.data
+
+    if ret is not None:
+        warnings.warn("Using Handled/NotHandled in event handlers is deprecated",
+                        DeprecationWarning, stacklevel = 2)
+
 def fire_class_handlers(event, d):
     if isinstance(event, logging.LogRecord):
         return
 
-    for handler in _handlers:
-        h = _handlers[handler]
-        event.data = d
-        if type(h).__name__ == "code":
-            locals = {"e": event}
-            bb.utils.simple_exec(h, locals)
-            ret = bb.utils.better_eval("tmpHandler(e)", locals)
-            if ret is not None:
-                warnings.warn("Using Handled/NotHandled in event handlers is deprecated",
-                              DeprecationWarning, stacklevel = 2)
-        else:
-            h(event)
-        del event.data
+    for name, handler in _handlers.iteritems():
+        try:
+            execute_handler(name, handler, event, d)
+        except BaseException:
+            continue
 
 ui_queue = []
 @atexit.register
@@ -136,6 +150,7 @@ def fire_from_worker(event, d):
     event = pickle.loads(event[7:-8])
     fire_ui_handlers(event, d)
 
+noop = lambda _: None
 def register(name, handler):
     """Register an Event handler"""
 
@@ -146,9 +161,18 @@ def register(name, handler):
     if handler is not None:
         # handle string containing python code
         if isinstance(handler, basestring):
-            tmp = "def tmpHandler(e):\n%s" % handler
-            comp = bb.utils.better_compile(tmp, "tmpHandler(e)", "bb.event._registerCode")
-            _handlers[name] = comp
+            tmp = "def %s(e):\n%s" % (name, handler)
+            try:
+                code = compile(tmp, "%s(e)" % name, "exec")
+            except SyntaxError:
+                logger.error("Unable to register event handler '%s':\n%s", name,
+                             ''.join(traceback.format_exc(limit=0)))
+                _handlers[name] = noop
+                return
+            env = {}
+            bb.utils.simple_exec(code, env)
+            func = bb.utils.better_eval(name, env)
+            _handlers[name] = func
         else:
             _handlers[name] = handler
 

bitbake/lib/bb/fetch/__init__.py

@@ -153,18 +153,18 @@ def fetcher_init(d):
     Called to initialize the fetchers once the configuration data is known.
     Calls before this must not hit the cache.
     """
-    pd = persist_data.persist(d)
     # When to drop SCM head revisions controlled by user policy
     srcrev_policy = bb.data.getVar('BB_SRCREV_POLICY', d, 1) or "clear"
     if srcrev_policy == "cache":
         logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy)
     elif srcrev_policy == "clear":
         logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy)
+        revs = persist_data.persist('BB_URI_HEADREVS', d)
         try:
-            bb.fetch.saved_headrevs = pd['BB_URI_HEADREVS'].items()
+            bb.fetch.saved_headrevs = revs.items()
         except:
             pass
-        del pd['BB_URI_HEADREVS']
+        revs.clear()
     else:
         raise FetchError("Invalid SRCREV cache policy of: %s" % srcrev_policy)
 
@@ -178,8 +178,7 @@ def fetcher_compare_revisions(d):
     return true/false on whether they've changed.
     """
 
-    pd = persist_data.persist(d)
-    data = pd['BB_URI_HEADREVS'].items()
+    data = persist_data.persist('BB_URI_HEADREVS', d).items()
     data2 = bb.fetch.saved_headrevs
 
     changed = False
@@ -756,15 +755,13 @@ class Fetch(object):
         if not hasattr(self, "_latest_revision"):
             raise ParameterError
 
-        pd = persist_data.persist(d)
-        revs = pd['BB_URI_HEADREVS']
+        revs = persist_data.persist('BB_URI_HEADREVS', d)
         key = self.generate_revision_key(url, ud, d)
-        rev = revs[key]
-        if rev != None:
-            return str(rev)
-
-        revs[key] = rev = self._latest_revision(url, ud, d)
-        return rev
+        try:
+            return revs[key]
+        except KeyError:
+            revs[key] = rev = self._latest_revision(url, ud, d)
+            return rev
 
     def sortable_revision(self, url, ud, d):
         """
@@ -773,18 +770,17 @@ class Fetch(object):
         if hasattr(self, "_sortable_revision"):
             return self._sortable_revision(url, ud, d)
 
-        pd = persist_data.persist(d)
-        localcounts = pd['BB_URI_LOCALCOUNT']
+        localcounts = persist_data.persist('BB_URI_LOCALCOUNT', d)
         key = self.generate_revision_key(url, ud, d)
 
         latest_rev = self._build_revision(url, ud, d)
-        last_rev = localcounts[key + '_rev']
+        last_rev = localcounts.get(key + '_rev')
         uselocalcount = bb.data.getVar("BB_LOCALCOUNT_OVERRIDE", d, True) or False
         count = None
         if uselocalcount:
             count = Fetch.localcount_internal_helper(ud, d)
         if count is None:
-            count = localcounts[key + '_count']
+            count = localcounts.get(key + '_count')
 
         if last_rev == latest_rev:
             return str(count + "+" + latest_rev)

bitbake/lib/bb/fetch/bzr.py

@@ -67,15 +67,15 @@ class Bzr(Fetch):
 
         options = []
 
-        if command is "revno":
+        if command == "revno":
             bzrcmd = "%s revno %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
         else:
             if ud.revision:
                 options.append("-r %s" % ud.revision)
 
-            if command is "fetch":
+            if command == "fetch":
                 bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
-            elif command is "update":
+            elif command == "update":
                 bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options))
             else:
                 raise FetchError("Invalid bzr command %s" % command)

bitbake/lib/bb/fetch/git.py

@@ -242,36 +242,36 @@ class Git(Fetch):
         """
         Look in the cache for the latest revision, if not present ask the SCM.
         """
-        persisted = bb.persist_data.persist(d)
-        revs = persisted['BB_URI_HEADREVS']
+        revs = bb.persist_data.persist('BB_URI_HEADREVS', d)
 
         key = self.generate_revision_key(url, ud, d, branch=True)
-        rev = revs[key]
-        if rev is None:
+
+        try:
+            return revs[key]
+        except KeyError:
             # Compatibility with old key format, no branch included
             oldkey = self.generate_revision_key(url, ud, d, branch=False)
-            rev = revs[oldkey]
-            if rev is not None:
-                del revs[oldkey]
-            else:
+            try:
+                rev = revs[oldkey]
+            except KeyError:
                 rev = self._latest_revision(url, ud, d)
+            else:
+                del revs[oldkey]
             revs[key] = rev
-
-        return str(rev)
+            return rev
 
     def sortable_revision(self, url, ud, d):
         """
 
         """
-        pd = bb.persist_data.persist(d)
-        localcounts = pd['BB_URI_LOCALCOUNT']
+        localcounts = bb.persist_data.persist('BB_URI_LOCALCOUNT', d)
         key = self.generate_revision_key(url, ud, d, branch=True)
         oldkey = self.generate_revision_key(url, ud, d, branch=False)
 
         latest_rev = self._build_revision(url, ud, d)
-        last_rev = localcounts[key + '_rev']
+        last_rev = localcounts.get(key + '_rev')
         if last_rev is None:
-            last_rev = localcounts[oldkey + '_rev']
+            last_rev = localcounts.get(oldkey + '_rev')
             if last_rev is not None:
                 del localcounts[oldkey + '_rev']
                 localcounts[key + '_rev'] = last_rev
@@ -281,9 +281,9 @@ class Git(Fetch):
         if uselocalcount:
             count = Fetch.localcount_internal_helper(ud, d)
         if count is None:
-            count = localcounts[key + '_count']
+            count = localcounts.get(key + '_count')
         if count is None:
-            count = localcounts[oldkey + '_count']
+            count = localcounts.get(oldkey + '_count')
             if count is not None:
                 del localcounts[oldkey + '_count']
                 localcounts[key + '_count'] = count

bitbake/lib/bb/fetch2/__init__.py

@@ -28,10 +28,8 @@ from __future__ import absolute_import
 from __future__ import print_function
 import os, re
 import logging
-import bb
-from   bb import data
-from   bb import persist_data
-from   bb import utils
+import bb.data, bb.persist_data, bb.utils
+from bb import data
 
 __version__ = "2"
 
@@ -224,18 +222,18 @@ def fetcher_init(d):
     Called to initialize the fetchers once the configuration data is known.
     Calls before this must not hit the cache.
     """
-    pd = persist_data.persist(d)
     # When to drop SCM head revisions controlled by user policy
     srcrev_policy = bb.data.getVar('BB_SRCREV_POLICY', d, True) or "clear"
     if srcrev_policy == "cache":
         logger.debug(1, "Keeping SRCREV cache due to cache policy of: %s", srcrev_policy)
     elif srcrev_policy == "clear":
         logger.debug(1, "Clearing SRCREV cache due to cache policy of: %s", srcrev_policy)
+        revs = bb.persist_data.persist('BB_URI_HEADREVS', d)
         try:
-            bb.fetch2.saved_headrevs = pd['BB_URI_HEADREVS'].items()
+            bb.fetch2.saved_headrevs = revs.items()
         except:
             pass
-        del pd['BB_URI_HEADREVS']
+        revs.clear()
     else:
         raise FetchError("Invalid SRCREV cache policy of: %s" % srcrev_policy)
 
@@ -249,8 +247,7 @@ def fetcher_compare_revisions(d):
     return true/false on whether they've changed.
     """
 
-    pd = persist_data.persist(d)
-    data = pd['BB_URI_HEADREVS'].items()
+    data = bb.persist_data.persist('BB_URI_HEADREVS', d).items()
     data2 = bb.fetch2.saved_headrevs
 
     changed = False
@@ -352,7 +349,7 @@ def get_srcrev(d):
 
 def localpath(url, d):
     fetcher = bb.fetch2.Fetch([url], d)
-	return fetcher.localpath(url)
+    return fetcher.localpath(url)
 
 def runfetchcmd(cmd, d, quiet = False, cleanup = []):
     """
@@ -372,7 +369,7 @@ def runfetchcmd(cmd, d, quiet = False, cleanup = []):
                   'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME']
 
     for var in exportvars:
-        val = data.getVar(var, d, True)
+        val = bb.data.getVar(var, d, True)
         if val:
             cmd = 'export ' + var + '=\"%s\"; %s' % (val, cmd)
 
@@ -498,15 +495,15 @@ def srcrev_internal_helper(ud, d, name):
         return ud.parm['tag']
 
     rev = None
-    pn = data.getVar("PN", d, True)
+    pn = bb.data.getVar("PN", d, True)
     if name != '':
-        rev = data.getVar("SRCREV_%s_pn-%s" % (name, pn), d, True)
+        rev = bb.data.getVar("SRCREV_%s_pn-%s" % (name, pn), d, True)
         if not rev:
-            rev = data.getVar("SRCREV_%s" % name, d, True)
+            rev = bb.data.getVar("SRCREV_%s" % name, d, True)
     if not rev:
-       rev = data.getVar("SRCREV_pn-%s" % pn, d, True)
+       rev = bb.data.getVar("SRCREV_pn-%s" % pn, d, True)
     if not rev:
-        rev = data.getVar("SRCREV", d, True)
+        rev = bb.data.getVar("SRCREV", d, True)
     if rev == "INVALID":
         raise FetchError("Please set SRCREV to a valid value", ud.url)
     if rev == "AUTOINC":
@@ -592,12 +589,12 @@ class FetchData(object):
         if "srcdate" in self.parm:
             return self.parm['srcdate']
 
-        pn = data.getVar("PN", d, True)
+        pn = bb.data.getVar("PN", d, True)
 
         if pn:
-            return data.getVar("SRCDATE_%s" % pn, d, True) or data.getVar("SRCDATE", d, True) or data.getVar("DATE", d, True)
+            return bb.data.getVar("SRCDATE_%s" % pn, d, True) or bb.data.getVar("SRCDATE", d, True) or bb.data.getVar("DATE", d, True)
 
-        return data.getVar("SRCDATE", d, True) or data.getVar("DATE", d, True)
+        return bb.data.getVar("SRCDATE", d, True) or bb.data.getVar("DATE", d, True)
 
 class FetchMethod(object):
     """Base class for 'fetch'ing data"""
@@ -790,10 +787,10 @@ class FetchMethod(object):
 
         localcount = None
         if name != '':
-            pn = data.getVar("PN", d, True)
-            localcount = data.getVar("LOCALCOUNT_" + name, d, True)
+            pn = bb.data.getVar("PN", d, True)
+            localcount = bb.data.getVar("LOCALCOUNT_" + name, d, True)
         if not localcount:
-            localcount = data.getVar("LOCALCOUNT", d, True)
+            localcount = bb.data.getVar("LOCALCOUNT", d, True)
         return localcount
 
     localcount_internal_helper = staticmethod(localcount_internal_helper)
@@ -805,15 +802,13 @@ class FetchMethod(object):
         if not hasattr(self, "_latest_revision"):
             raise ParameterError("The fetcher for this URL does not support _latest_revision", url)
 
-        pd = persist_data.persist(d)
-        revs = pd['BB_URI_HEADREVS']
+        revs = bb.persist_data.persist('BB_URI_HEADREVS', d)
         key = self.generate_revision_key(url, ud, d, name)
-        rev = revs[key]
-        if rev != None:
-            return str(rev)
-
-        revs[key] = rev = self._latest_revision(url, ud, d, name)
-        return rev
+        try:
+            return revs[key]
+        except KeyError:
+            revs[key] = rev = self._latest_revision(url, ud, d, name)
+            return rev
 
     def sortable_revision(self, url, ud, d, name):
         """
@@ -822,18 +817,17 @@ class FetchMethod(object):
         if hasattr(self, "_sortable_revision"):
             return self._sortable_revision(url, ud, d)
 
-        pd = persist_data.persist(d)
-        localcounts = pd['BB_URI_LOCALCOUNT']
+        localcounts = bb.persist_data.persist('BB_URI_LOCALCOUNT', d)
         key = self.generate_revision_key(url, ud, d, name)
 
         latest_rev = self._build_revision(url, ud, d, name)
-        last_rev = localcounts[key + '_rev']
+        last_rev = localcounts.get(key + '_rev')
         uselocalcount = bb.data.getVar("BB_LOCALCOUNT_OVERRIDE", d, True) or False
         count = None
         if uselocalcount:
             count = FetchMethod.localcount_internal_helper(ud, d, name)
         if count is None:
-            count = localcounts[key + '_count'] or "0"
+            count = localcounts.get(key + '_count') or "0"
 
         if last_rev == latest_rev:
             return str(count + "+" + latest_rev)

bitbake/lib/bb/fetch2/bzr.py

@@ -66,15 +66,15 @@ class Bzr(FetchMethod):
 
         options = []
 
-        if command is "revno":
+        if command == "revno":
             bzrcmd = "%s revno %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
         else:
             if ud.revision:
                 options.append("-r %s" % ud.revision)
 
-            if command is "fetch":
+            if command == "fetch":
                 bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot)
-            elif command is "update":
+            elif command == "update":
                 bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options))
             else:
                 raise FetchError("Invalid bzr command %s" % command, ud.url)

bitbake/lib/bb/fetch2/git.py

@@ -57,6 +57,11 @@ class Git(FetchMethod):
         if 'nocheckout' in ud.parm:
             ud.nocheckout = True
 
+        # rebaseable means the upstream git repo may rebase in the future,
+        # and current revision may disappear from upstream repo
+        # rebaseable is false by default. set rebaseable=1 in SRC_URI if rebaseable.
+        ud.rebaseable = ud.parm.get("rebaseable","0") == "1"
+
         branches = ud.parm.get("branch", "master").split(',')
         if len(branches) != len(ud.names):
             raise bb.fetch2.ParameterError("The number of name and branch parameters is not balanced", ud.url)
@@ -65,16 +70,9 @@ class Git(FetchMethod):
             branch = branches[ud.names.index(name)]
             ud.branches[name] = branch
 
-        gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.'))
-        ud.mirrortarball = 'git2_%s.tar.gz' % (gitsrcname)
-        ud.fullmirror = os.path.join(data.getVar("DL_DIR", d, True), ud.mirrortarball)
-        ud.clonedir = os.path.join(data.expand('${GITDIR}', d), gitsrcname)
-
         ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
 
-        ud.write_tarballs = (data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0"
-
-        ud.localfile = ud.clonedir
+        ud.write_tarballs = ((data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0") or ud.rebaseable
 
         ud.setup_revisons(d)
 
@@ -84,6 +82,20 @@ class Git(FetchMethod):
                 ud.branches[name] = ud.revisions[name]
                 ud.revisions[name] = self.latest_revision(ud.url, ud, d, name)
 
+        gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.'))
+        # for rebaseable git repo, it is necessary to keep mirror tar ball
+        # per revision, so that even the revision disappears from the
+        # upstream repo in the future, the mirror will remain intact and still
+        # contains the revision
+        if ud.rebaseable:
+            for name in ud.names:
+                gitsrcname = gitsrcname + '_' + ud.revisions[name]
+        ud.mirrortarball = 'git2_%s.tar.gz' % (gitsrcname)
+        ud.fullmirror = os.path.join(data.getVar("DL_DIR", d, True), ud.mirrortarball)
+        ud.clonedir = os.path.join(data.expand('${GITDIR}', d), gitsrcname)
+
+        ud.localfile = ud.clonedir
+
     def localpath(self, url, ud, d):
         return ud.clonedir
 

bitbake/lib/bb/fetch2/hg.py

@@ -94,21 +94,21 @@ class Hg(FetchMethod):
         else:
             hgroot = ud.user + "@" + host + ud.path
 
-        if command is "info":
+        if command == "info":
             return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module)
 
         options = [];
         if ud.revision:
             options.append("-r %s" % ud.revision)
 
-        if command is "fetch":
+        if command == "fetch":
             cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module)
-        elif command is "pull":
+        elif command == "pull":
             # do not pass options list; limiting pull to rev causes the local
             # repo not to contain it and immediately following "update" command
             # will crash
             cmd = "%s pull" % (basecmd)
-        elif command is "update":
+        elif command == "update":
             cmd = "%s update -C %s" % (basecmd, " ".join(options))
         else:
             raise FetchError("Invalid hg command %s" % command, ud.url)

bitbake/lib/bb/fetch2/osc.py

@@ -68,9 +68,9 @@ class Osc(FetchMethod):
 
         coroot = self._strip_leading_slashes(ud.path)
 
-        if command is "fetch":
+        if command == "fetch":
             osccmd = "%s %s co %s/%s %s" % (basecmd, config, coroot, ud.module, " ".join(options))
-        elif command is "update":
+        elif command == "update":
             osccmd = "%s %s up %s" % (basecmd, config, " ".join(options))
         else:
             raise FetchError("Invalid osc command %s" % command, ud.url)

bitbake/lib/bb/fetch2/svn.py

@@ -87,7 +87,7 @@ class Svn(FetchMethod):
         if ud.pswd:
             options.append("--password %s" % ud.pswd)
 
-        if command is "info":
+        if command == "info":
             svncmd = "%s info %s %s://%s/%s/" % (basecmd, " ".join(options), proto, svnroot, ud.module)
         else:
             suffix = ""
@@ -95,9 +95,9 @@ class Svn(FetchMethod):
                 options.append("-r %s" % ud.revision)
                 suffix = "@%s" % (ud.revision)
 
-            if command is "fetch":
+            if command == "fetch":
                 svncmd = "%s co %s %s://%s/%s%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module)
-            elif command is "update":
+            elif command == "update":
                 svncmd = "%s update %s" % (basecmd, " ".join(options))
             else:
                 raise FetchError("Invalid svn command %s" % command, ud.url)

bitbake/lib/bb/msg.py

@@ -147,8 +147,8 @@ def set_debug_domains(domainargs):
 #
 
 def debug(level, msgdomain, msg):
-    warnings.warn("bb.msg.debug will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.debug is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     level = logging.DEBUG - (level - 1)
     if not msgdomain:
         logger.debug(level, msg)
@@ -156,13 +156,13 @@ def debug(level, msgdomain, msg):
         loggers[msgdomain].debug(level, msg)
 
 def plain(msg):
-    warnings.warn("bb.msg.plain will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.plain is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     logger.plain(msg)
 
 def note(level, msgdomain, msg):
-    warnings.warn("bb.msg.note will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.note is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     if level > 1:
         if msgdomain:
             logger.verbose(msg)
@@ -175,24 +175,22 @@ def note(level, msgdomain, msg):
             loggers[msgdomain].info(msg)
 
 def warn(msgdomain, msg):
-    warnings.warn("bb.msg.warn will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.warn is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     if not msgdomain:
         logger.warn(msg)
     else:
         loggers[msgdomain].warn(msg)
 
 def error(msgdomain, msg):
-    warnings.warn("bb.msg.error will soon be deprecated in favor of the python 'logging' module",
-                  PendingDeprecationWarning, stacklevel=2)
+    warnings.warn("bb.msg.error is deprecated in favor of the python 'logging' module",
+                  DeprecationWarning, stacklevel=2)
     if not msgdomain:
         logger.error(msg)
     else:
         loggers[msgdomain].error(msg)
 
 def fatal(msgdomain, msg):
-    warnings.warn("bb.msg.fatal will soon be deprecated in favor of raising appropriate exceptions",
-                  PendingDeprecationWarning, stacklevel=2)
     if not msgdomain:
         logger.critical(msg)
     else:

bitbake/lib/bb/parse/ast.py

@@ -369,10 +369,13 @@ def multi_finalize(fn, d):
         logger.debug(2, "Appending .bbappend file %s to %s", append, fn)
         bb.parse.BBHandler.handle(append, d, True)
 
+    onlyfinalise = d.getVar("__ONLYFINALISE", False)
+
     safe_d = d
     d = bb.data.createCopy(safe_d)
     try:
-        finalize(fn, d)
+        if not onlyfinalise or "default" in onlyfinalise:
+            finalize(fn, d)
     except bb.parse.SkipPackage:
         bb.data.setVar("__SKIPPED", True, d)
     datastores = {"": safe_d}
@@ -434,7 +437,8 @@ def multi_finalize(fn, d):
     for variant, variant_d in datastores.iteritems():
         if variant:
             try:
-                finalize(fn, variant_d, variant)
+                if not onlyfinalise or variant in onlyfinalise:
+                    finalize(fn, variant_d, variant)
             except bb.parse.SkipPackage:
                 bb.data.setVar("__SKIPPED", True, variant_d)
 

bitbake/lib/bb/persist_data.py

@@ -26,7 +26,8 @@ import logging
 import os.path
 import sys
 import warnings
-import bb.msg, bb.data, bb.utils
+from bb.compat import total_ordering
+from collections import Mapping
 
 try:
     import sqlite3
@@ -39,8 +40,11 @@ if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3):
 
 
 logger = logging.getLogger("BitBake.PersistData")
+if hasattr(sqlite3, 'enable_shared_cache'):
+    sqlite3.enable_shared_cache(True)
 
 
+@total_ordering
 class SQLTable(collections.MutableMapping):
     """Object representing a table/domain in the database"""
     def __init__(self, cursor, table):
@@ -62,16 +66,31 @@ class SQLTable(collections.MutableMapping):
                     continue
                 raise
 
+    def __enter__(self):
+        self.cursor.__enter__()
+        return self
+
+    def __exit__(self, *excinfo):
+        self.cursor.__exit__(*excinfo)
+
     def __getitem__(self, key):
         data = self._execute("SELECT * from %s where key=?;" %
                              self.table, [key])
         for row in data:
             return row[1]
+        raise KeyError(key)
 
     def __delitem__(self, key):
+        if key not in self:
+            raise KeyError(key)
         self._execute("DELETE from %s where key=?;" % self.table, [key])
 
     def __setitem__(self, key, value):
+        if not isinstance(key, basestring):
+            raise TypeError('Only string keys are supported')
+        elif not isinstance(value, basestring):
+            raise TypeError('Only string values are supported')
+
         data = self._execute("SELECT * from %s where key=?;" %
                                    self.table, [key])
         exists = len(list(data))
@@ -92,53 +111,40 @@ class SQLTable(collections.MutableMapping):
 
     def __iter__(self):
         data = self._execute("SELECT key FROM %s;" % self.table)
-        for row in data:
-            yield row[0]
+        return (row[0] for row in data)
 
-    def iteritems(self):
-        data = self._execute("SELECT * FROM %s;" % self.table)
-        for row in data:
-            yield row[0], row[1]
+    def __lt__(self, other):
+        if not isinstance(other, Mapping):
+            raise NotImplemented
+
+        return len(self) < len(other)
+
+    def values(self):
+        return list(self.itervalues())
 
     def itervalues(self):
         data = self._execute("SELECT value FROM %s;" % self.table)
-        for row in data:
-            yield row[0]
+        return (row[0] for row in data)
 
+    def items(self):
+        return list(self.iteritems())
 
-class SQLData(object):
-    """Object representing the persistent data"""
-    def __init__(self, filename):
-        bb.utils.mkdirhier(os.path.dirname(filename))
+    def iteritems(self):
+        return self._execute("SELECT * FROM %s;" % self.table)
 
-        self.filename = filename
-        self.connection = sqlite3.connect(filename, timeout=30,
-                                          isolation_level=None)
-        self.cursor = self.connection.cursor()
-        self._tables = {}
+    def clear(self):
+        self._execute("DELETE FROM %s;" % self.table)
 
-    def __getitem__(self, table):
-        if not isinstance(table, basestring):
-            raise TypeError("table argument must be a string, not '%s'" %
-                            type(table))
-
-        if table in self._tables:
-            return self._tables[table]
-        else:
-            tableobj = self._tables[table] = SQLTable(self.cursor, table)
-            return tableobj
-
-    def __delitem__(self, table):
-        if table in self._tables:
-            del self._tables[table]
-        self.cursor.execute("DROP TABLE IF EXISTS %s;" % table)
+    def has_key(self, key):
+        return key in self
 
 
 class PersistData(object):
     """Deprecated representation of the bitbake persistent data store"""
     def __init__(self, d):
-        warnings.warn("Use of PersistData will be deprecated in the future",
-                      category=PendingDeprecationWarning,
+        warnings.warn("Use of PersistData is deprecated.  Please use "
+                      "persist(domain, d) instead.",
+                      category=DeprecationWarning,
                       stacklevel=2)
 
         self.data = persist(d)
@@ -181,14 +187,19 @@ class PersistData(object):
         """
         del self.data[domain][key]
 
+def connect(database):
+    return sqlite3.connect(database, timeout=30, isolation_level=None)
 
-def persist(d):
-    """Convenience factory for construction of SQLData based upon metadata"""
+def persist(domain, d):
+    """Convenience factory for SQLTable objects based upon metadata"""
+    import bb.data, bb.utils
     cachedir = (bb.data.getVar("PERSISTENT_DIR", d, True) or
                 bb.data.getVar("CACHE", d, True))
     if not cachedir:
         logger.critical("Please set the 'PERSISTENT_DIR' or 'CACHE' variable")
         sys.exit(1)
 
+    bb.utils.mkdirhier(cachedir)
     cachefile = os.path.join(cachedir, "bb_persist_data.sqlite3")
-    return SQLData(cachefile)
+    connection = connect(cachefile)
+    return SQLTable(connection, domain)

bitbake/lib/bb/runqueue.py

@@ -929,7 +929,7 @@ class RunQueue:
 
         if self.state is runQueuePrepare:
             self.rqexe = RunQueueExecuteDummy(self)
-            if self.rqdata.prepare() is 0:
+            if self.rqdata.prepare() == 0:
                 self.state = runQueueComplete
             else:
                 self.state = runQueueSceneInit
@@ -1018,7 +1018,7 @@ class RunQueueExecute:
         collect the process exit codes and close the information pipe.
         """
         result = os.waitpid(-1, os.WNOHANG)
-        if result[0] is 0 and result[1] is 0:
+        if result[0] == 0 and result[1] == 0:
             return None
         task = self.build_pids[result[0]]
         del self.build_pids[result[0]]
@@ -1060,23 +1060,26 @@ class RunQueueExecute:
         return
 
     def fork_off_task(self, fn, task, taskname, quieterrors=False):
+        # We need to setup the environment BEFORE the fork, since
+        # a fork() or exec*() activates PSEUDO...
 
-        envbackup = os.environ.copy()
         env = {}
+        envbackup = {}
 
         taskdep = self.rqdata.dataCache.task_deps[fn]
         if 'fakeroot' in taskdep and taskname in taskdep['fakeroot']:
             envvars = (self.rqdata.dataCache.fakerootenv[fn] or "").split()
-            for var in envvars:
-                comps = var.split("=")
-                env[comps[0]] = comps[1]
+            for key, value in (var.split('=') for var in envvars):
+                envbackup[key] = os.environ.get(key)
+                os.environ[key] = value
+                env[key] = value
 
             fakedirs = (self.rqdata.dataCache.fakerootdirs[fn] or "").split()
             for p in fakedirs:
-                bb.mkdirhier(p)
-            logger.debug(2, "Running %s:%s under fakeroot, state dir is %s" % (fn, taskname, fakedirs))
-            for e in env:
-                os.putenv(e, env[e])
+                bb.utils.mkdirhier(p)
+
+            logger.debug(2, 'Running %s:%s under fakeroot, fakedirs: %s' %
+                            (fn, taskname, ', '.join(fakedirs)))
 
         sys.stdout.flush()
         sys.stderr.flush()
@@ -1087,6 +1090,7 @@ class RunQueueExecute:
             pid = os.fork()
         except OSError as e:
             bb.msg.fatal(bb.msg.domain.RunQueue, "fork failed: %d (%s)" % (e.errno, e.strerror))
+
         if pid == 0:
             pipein.close()
 
@@ -1094,12 +1098,6 @@ class RunQueueExecute:
             # events
             bb.event.worker_pid = os.getpid()
             bb.event.worker_pipe = pipeout
-            bb.event.useStdout = False
-
-            # Child processes should send their messages to the UI
-            # process via the server process, not print them
-            # themselves
-            bblogger.handlers = [bb.event.LogHandler()]
 
             self.rq.state = runQueueChildProcess
             # Make the child the process group leader
@@ -1143,12 +1141,12 @@ class RunQueueExecute:
                 os._exit(ret)
             except:
                 os._exit(1)
-
-        for e in env:
-            os.unsetenv(e)
-        for e in envbackup:
-            if e in env:
-                os.putenv(e, envbackup[e])
+        else:
+            for key, value in envbackup.iteritems():
+                if value is None:
+                    del os.environ[key]
+                else:
+                    os.environ[key] = value
 
         return pid, pipein, pipeout
 

bitbake/lib/bb/siggen.py

@@ -1,5 +1,6 @@
 import hashlib
 import logging
+import os
 import re
 import bb.data
 

bitbake/lib/bb/ui/crumbs/hobeventhandler.py

@@ -102,6 +102,8 @@ class HobHandler(gobject.GObject):
         elif isinstance(event, bb.event.CacheLoadCompleted) and pbar:
             pbar.update(bb.ui.crumbs.hobeventhandler.progress_total, bb.ui.crumbs.hobeventhandler.progress_total)
         elif isinstance(event, bb.event.ParseStarted) and pbar:
+            if event.total == 0:
+                return
             pbar.set_title("Processing recipes")
             bb.ui.crumbs.hobeventhandler.progress_total = event.total
             pbar.update(0, bb.ui.crumbs.hobeventhandler.progress_total)

bitbake/lib/bb/ui/crumbs/runningbuild.py

@@ -234,6 +234,8 @@ class RunningBuild (gobject.GObject):
             pbar.update(self.progress_total, self.progress_total)
 
         elif isinstance(event, bb.event.ParseStarted) and pbar:
+            if event.total == 0:
+                return
             pbar.set_title("Processing recipes")
             self.progress_total = event.total
             pbar.update(0, self.progress_total)
@@ -308,4 +310,4 @@ class RunningBuildTreeView (gtk.TreeView):
 
         clipboard = gtk.clipboard_get()
         clipboard.set_text(paste_url)
-        clipboard.store()
+        clipboard.store()

bitbake/lib/bb/ui/depexp.py

@@ -254,6 +254,8 @@ def main(server, eventHandler):
 
             if isinstance(event, bb.event.ParseStarted):
                 progress_total = event.total
+                if progress_total == 0:
+                    continue
                 gtk.gdk.threads_enter()
                 pbar.set_title("Processing recipes")
                 pbar.update(0, progress_total)

bitbake/lib/bb/ui/knotty.py

@@ -150,12 +150,17 @@ def main(server, eventHandler):
                 logger.info(event._message)
                 continue
             if isinstance(event, bb.event.ParseStarted):
+                if event.total == 0:
+                    continue
                 parseprogress = new_progress("Parsing recipes", event.total).start()
                 continue
             if isinstance(event, bb.event.ParseProgress):
                 parseprogress.update(event.current)
                 continue
             if isinstance(event, bb.event.ParseCompleted):
+                if not parseprogress:
+                    continue
+
                 parseprogress.finish()
                 print(("Parsing of %d .bb files complete (%d cached, %d parsed). %d targets, %d skipped, %d masked, %d errors."
                     % ( event.total, event.cached, event.parsed, event.virtuals, event.skipped, event.masked, event.errors)))

documentation/Makefile

@@ -1,142 +0,0 @@
-# This is a single Makefile to handle all generated Yocto Project documents.
-# The Makefile needs to live in the documents directory and all figures used
-# in any manuals must be PNG files and live in the individual book's figures
-# directory.
-#
-# The Makefile has these targets:
-#
-#    pdf: generates a PDF version of a manual.  Not valid for the Quick Start
-#    html: generates an HTML version of a manual.
-#    tarball: creates a tarball for the doc files.
-#    validate: validates 
-#    publish: pushes generated files to the Yocto Project website
-#    clean: removes files
-#
-# The Makefile generates an HTML and PDF version of every document except the
-# Yocto Project Quick Start.  The Quick Start is in HTML form only.  The variable
-# The command-line argument DOC represents the folder name in which a particular 
-# document is stored.  The command-line argument VER represents the distro 
-# version of the Yocto Release for which the manuals are being generated.
-# You must invoke the Makefile with the DOC and VER arguments.
-# Examples:
-#
-#     make DOC=bsp-guide VER=1.1
-#     make DOC=yocto-project-qs VER=1.1
-#     make pdf DOC=yocto-project-qs VER=1.1
-#
-# The first example generates the HTML and PDF versions of the BSP Guide for 
-# the Yocto Project 1.1 Release.  The second example generates the HTML version
-# of the Quick Start.  The third example generates an error because you cannot
-# generate a PDF version of the Quick Start.
-#
-# Use the publish target to push the generated manuals to the Yocto Project 
-# website.  All files needed for the manual's HTML form are pushed as well as the 
-# PDF version (if applicable).  
-# Examples:
-#
-#    make publish DOC=bsp-guide VER=1.1
-#    make publish DOC=adt-manual VER=1.1
-#
-
-ifeq ($(DOC),bsp-guide)
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-           --xinclude
-ALLPREQ = html pdf tarball
-TARFILES = style.css bsp-guide.html bsp-guide.pdf figures/bsp-title.png
-MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
-FIGURES = figures
-STYLESHEET = $(DOC)/*.css
-
-endif
-
-ifeq ($(DOC),yocto-project-qs)
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --xinclude
-ALLPREQ = html tarball
-TARFILES = yocto-project-qs.html style.css figures/yocto-environment.png figures/building-an-image.png figures/using-a-pre-built-image.png figures/yocto-project-transp.png
-MANUALS = $(DOC)/$(DOC).html
-FIGURES = figures
-STYLESHEET = $(DOC)/*.css
-endif
-
-ifeq ($(DOC),poky-ref-manual)
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  appendix.autolabel A \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-           --xinclude
-ALLPREQ = html pdf tarball
-TARFILES = poky-ref-manual.html style.css figures/poky-title.png figures/ss-sato.png
-MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
-FIGURES = figures
-STYLESHEET = $(DOC)/*.css
-endif
-
-
-ifeq ($(DOC),adt-manual)
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  appendix.autolabel A \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-           --xinclude
-ALLPREQ = html pdf tarball
-TARFILES = adt-manual.html adt-manual.pdf style.css figures/adt-title.png
-MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
-FIGURES = figures
-STYLESHEET = $(DOC)/*.css
-endif
-
-ifeq ($(DOC),kernel-manual)
-XSLTOPTS = --stringparam html.stylesheet style.css \
-           --stringparam  chapter.autolabel 1 \
-           --stringparam  appendix.autolabel A \
-           --stringparam  section.autolabel 1 \
-           --stringparam  section.label.includes.component.label 1 \
-           --xinclude
-ALLPREQ = html pdf tarball
-TARFILES = kernel-manual.html kernel-manual.pdf style.css figures/kernel-title.png figures/kernel-architecture-overview.png
-MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
-FIGURES = figures
-STYLESHEET = $(DOC)/*.css
-endif
-
-
-##
-# These URI should be rewritten by your distribution's xml catalog to
-# match your localy installed XSL stylesheets.
-XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
-XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
-
-all: $(ALLPREQ)
-
-pdf:
-ifeq ($(DOC),yocto-project-qs)
-	@echo " "
-	@echo "ERROR: You cannot generate a PDF file for the Yocto Project Quick Start"
-	@echo " "
-else
-	cd $(DOC); ../tools/poky-docbook-to-pdf $(DOC).xml ../template; cd ..
-endif
-    
-html:
-#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
-	cd $(DOC); xsltproc $(XSLTOPTS) -o $(DOC).html $(DOC)-customization.xsl $(DOC).xml; cd ..
-
-tarball: html
-	cd $(DOC); tar -cvzf $(DOC).tgz $(TARFILES); cd ..
-
-validate:
-	cd $(DOC); xmllint --postvalid --xinclude --noout $(DOC).xml; cd ..
-
-
-publish:
-	scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/$(VER)/$(DOC)
-	cd $(DOC); scp -r $(FIGURES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/$(VER)/$(DOC)/figures
-
-clean:
-	rm -f $(MANUALS)

documentation/adt-manual/Makefile

@@ -0,0 +1,44 @@
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  appendix.autolabel A \
+           --stringparam  section.autolabel 1 \
+           --stringparam  section.label.includes.component.label 1 \
+         --xinclude
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
+XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
+
+all: html pdf tarball
+
+pdf:
+	../tools/poky-docbook-to-pdf adt-manual.xml ../template
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+
+html:
+#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
+
+#	xsltproc $(XSLTOPTS) -o adt-manual.html $(XSL_XHTML_URI) adt-manual.xml
+	xsltproc $(XSLTOPTS) -o adt-manual.html adt-manual-customization.xsl adt-manual.xml
+
+tarball: html
+	tar -cvzf adt-manual.tgz adt-manual.html adt-manual.pdf style.css figures/adt-title.png
+
+validate:
+	xmllint --postvalid --xinclude --noout adt-manual.xml
+
+MANUALS = adt-manual.html adt-manual.pdf
+FIGURES = figures/*.png
+STYLESHEET = *.css
+
+publish:
+	scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/adt-manual
+	scp -r $(FIGURES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/adt-manual/figures
+
+clean:
+	rm -f $(MANUALS)

documentation/adt-manual/adt-manual.xml

@@ -33,16 +33,6 @@
                 <date>6 April 2011</date>
                 <revremark>Initial Document released with Yocto Project 1.0 on 6 April 2011.</revremark>
             </revision>
-            <revision>
-                <revnumber>1.0.1</revnumber>
-                <date>23 May 2011</date>
-                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.0.2</revnumber>
-                <date>20 December 2011</date>
-                <revremark>Released with Yocto Project 1.0.2 on 20 December 2011.</revremark>
-            </revision>
         </revhistory>
 
     <copyright>

documentation/bsp-guide/Makefile

@@ -0,0 +1,37 @@
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  section.autolabel 1 \
+           --stringparam  section.label.includes.component.label 1 \
+         --xinclude
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
+XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
+
+all: html pdf tarball
+
+pdf:
+	../tools/poky-docbook-to-pdf bsp-guide.xml ../template
+
+html:
+#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
+	xsltproc $(XSLTOPTS) -o bsp-guide.html bsp-guide-customization.xsl bsp-guide.xml
+
+tarball: html
+	tar -cvzf bsp-guide.tgz style.css bsp-guide.html bsp-guide.pdf figures/bsp-title.png
+
+validate:
+	xmllint --postvalid --xinclude --noout bsp-guide.xml
+
+MANUALS = bsp-guide.html bsp-guide.pdf
+FIGURES = figures/*.png
+STYLESHEET = *.css
+
+publish:
+	scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/bsp-guide
+	scp -r $(FIGURES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/bsp-guide/figures
+
+clean:
+	rm -f $(OUTPUTS)

documentation/bsp-guide/bsp-guide.xml

@@ -39,16 +39,6 @@
                 <date>6 April 2011</date>
                 <revremark>This manual revision corresponds to the Yocto Project 1.0 Release.</revremark>
             </revision>
-            <revision>
-                <revnumber>1.0.1</revnumber>
-                <date>23 May 2011</date>
-                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.0.2</revnumber>
-                <date>20 December 2011</date>
-                <revremark>Released with Yocto Project 1.0.2 on 20 December 2011.</revremark>
-            </revision>
         </revhistory>
 
     <copyright>

documentation/bsp-guide/bsp.xml

@@ -609,7 +609,7 @@ FILESEXTRAPATHS := "${THISDIR}/${PN}"
 		</para>
 
 		<programlisting>
-		  $ BSPKEY_&lt;keydomain&gt;=&lt;key&gt; bitbake poky-image-sato
+		  $ BSPKEY_&lt;keydomain&gt;=&lt;key&gt; bitbake core-image-sato
 		</programlisting>
 
 		<para>

documentation/kernel-manual/Makefile

@@ -0,0 +1,38 @@
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  appendix.autolabel A \
+           --stringparam  section.autolabel 1 \
+           --stringparam  section.label.includes.component.label 1 \
+         --xinclude
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
+XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
+
+all: html pdf tarball
+
+pdf:
+	../tools/poky-docbook-to-pdf kernel-manual.xml ../template
+
+html:
+#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
+	xsltproc $(XSLTOPTS) -o kernel-manual.html yocto-project-kernel-manual-customization.xsl kernel-manual.xml
+
+tarball: html
+	tar -cvzf kernel-manual.tgz kernel-manual.html kernel-manual.pdf style.css figures/kernel-title.png figures/kernel-architecture-overview.png
+
+validate:
+	xmllint --postvalid --xinclude --noout kernel-manual.xml
+
+MANUALS = kernel-manual.html kernel-manual.pdf
+FIGURES = figures/*.png
+STYLESHEET = *.css
+
+publish:
+	scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/kernel-manual
+	scp -r $(FIGURES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/kernel-manual/figures
+
+clean:
+	rm -f $(OUTPUTS)

documentation/kernel-manual/kernel-how-to.xml

@@ -1126,7 +1126,7 @@ That's it. Configure and build.
                 <para>
                     You should now be able to build and boot an image with the new kernel:
                     <literallayout class='monospaced'>
-     $ bitbake poky-image-sato-live
+     $ bitbake core-image-sato-live
                     </literallayout>
                 </para></listitem>
 

documentation/kernel-manual/kernel-manual.xml

@@ -39,16 +39,6 @@
                 <date>6 April 2011</date>
                 <revremark>This revision corresponds with the Yocto Project 1.0 Release.</revremark>
             </revision>
-            <revision>
-                <revnumber>1.0.1</revnumber>
-                <date>23 May 2011</date>
-                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.0.2</revnumber>
-                <date>20 December 2011</date>
-                <revremark>Released with Yocto Project 1.0.2 on 20 December 2011.</revremark>
-            </revision>
         </revhistory>
 
     <copyright>

documentation/poky-ref-manual/Makefile

@@ -0,0 +1,38 @@
+XSLTOPTS = --stringparam html.stylesheet style.css \
+           --stringparam  chapter.autolabel 1 \
+           --stringparam  appendix.autolabel A \
+           --stringparam  section.autolabel 1 \
+           --stringparam  section.label.includes.component.label 1 \
+         --xinclude
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
+XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
+
+all: html pdf tarball
+
+pdf:
+	../tools/poky-docbook-to-pdf poky-ref-manual.xml ../template
+
+html:
+#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
+	xsltproc $(XSLTOPTS) -o poky-ref-manual.html poky-ref-manual-customization.xsl poky-ref-manual.xml
+
+tarball: html
+	tar -cvzf poky-ref-manual.tgz poky-ref-manual.html style.css figures/poky-title.png figures/ss-sato.png
+
+validate:
+	xmllint --postvalid --xinclude --noout poky-ref-manual.xml
+
+MANUALS = poky-ref-manual.html poky-ref-manual.pdf
+FIGURES = figures/*.png
+STYLESHEET = *.css
+
+publish:
+	scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/poky-ref-manual
+	scp -r $(FIGURES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/poky-ref-manual/figures
+
+clean:
+	rm -f $(OUTPUTS)

documentation/poky-ref-manual/development.xml

@@ -383,8 +383,8 @@
                         triplet is "i586-poky-linux".</para></listitem>
                         <listitem><para>Kernel: Use the file chooser to select the kernel used with QEMU.</para></listitem>
                         <listitem><para>Root filesystem: Use the file chooser to select the root 
-                        filesystem directory.  This directory is where you use "poky-extract-sdk" to extract the 
-                        poky-image-sdk tarball.</para></listitem>
+                        filesystem directory.  This directory is where you use "runqemu-extract-sdk" to extract the 
+                        core-image-sdk tarball.</para></listitem>
                      </itemizedlist>
                 </para>
                 </section>
@@ -738,7 +738,7 @@ tmp/sysroots/&lt;host-arch&gt;/usr/bin/&lt;target-abi&gt;-gdb
             <para>
                 Perhaps the easiest is to have an 'sdk' image that corresponds to the plain
                 image installed on the device. 
-                In the case of 'poky-image-sato', 'poky-image-sdk' would contain suitable symbols. 
+                In the case of 'core-image-sato', 'core-image-sdk' would contain suitable symbols. 
                 Because the sdk images already have the debugging symbols installed it is just a 
                 question of expanding the archive to some location and then informing GDB. 
             </para>
@@ -764,17 +764,17 @@ tmp/sysroots/&lt;host-arch&gt;/usr/bin/&lt;target-abi&gt;-gdb
                 <filename>tmp/rootfs</filename>:
                 <programlisting>
 tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf -o \
+tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf -o \
 tmp/rootfs/ update
                 </programlisting></para></listitem>
                 <listitem><para>Install the debugging information:
                 <programlisting>
 tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
+tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf \
 -o tmp/rootfs install foo
 
 tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
-tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
+tmp/work/&lt;target-abi&gt;/core-image-sato-1.0-r0/temp/opkg.conf \
 -o tmp/rootfs install foo-dbg
                 </programlisting></para></listitem>
             </orderedlist>

documentation/poky-ref-manual/extendpoky.xml

@@ -269,9 +269,9 @@ fi
                 The following example shows the form for the two lines you need:
             </para>
             <programlisting>
-IMAGE_INSTALL = "task-poky-x11-base package1 package2"
+IMAGE_INSTALL = "task-core-x11-base package1 package2"
 
-inherit poky-image
+inherit core-image
             </programlisting>
             <para>
                 By creating a custom image, a developer has total control
@@ -283,11 +283,11 @@ inherit poky-image
             </para>
             <para>
                 The other method for creating a custom image is to modify an existing image. 
-                For example, if a developer wants to add "strace" into "poky-image-sato", they can use 
+                For example, if a developer wants to add "strace" into "core-image-sato", they can use 
                 the following recipe:
             </para>
             <programlisting>
-require poky-image-sato.bb
+require core-image-sato.bb
 
 IMAGE_INSTALL += "strace"
             </programlisting>
@@ -349,13 +349,13 @@ RRECOMMENDS_task-custom-tools = "\
         </section>
 
         <section id='usingpoky-extend-customimage-imagefeatures'>
-            <title>Customizing Images Using Custom IMAGE_FEATURES and EXTRA_IMAGE_FEATURES</title>
+            <title>Customizing Images Using Custom IMAGE_FEATURES</title>
             <para>
-                Ultimately users might want to add extra image "features" to the set used by Poky with the 
+                Ultimately users might want to add extra image "features" as used by Poky with the 
                 <glossterm><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm>
                 variable. 
                 To create these features, the best reference is 
-                <filename>meta/classes/poky-image.bbclass</filename>, which shows how poky achieves this. 
+                <filename>meta/classes/core-image.bbclass</filename>, which shows how poky achieves this. 
                 In summary, the file looks at the contents of the 
                 <glossterm><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm>
                 variable and then maps that into a set of tasks or packages. 
@@ -363,16 +363,13 @@ RRECOMMENDS_task-custom-tools = "\
                 </glossterm> variable is generated automatically. 
                 Users can add extra features by extending the class or creating a custom class for use 
                 with specialized image <filename>.bb</filename> files.
-                You can also add more features by configuring the 
-                <glossterm><link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link></glossterm>
-                variable in the <filename>local.conf</filename> file.
             </para>
             <para>
                 Poky ships with two SSH servers you can use in your images: Dropbear and OpenSSH. 
                 Dropbear is a minimal SSH server appropriate for resource-constrained environments,
                 while OpenSSH is a well-known standard SSH server implementation.
-                By default, poky-image-sato is configured to use Dropbear.
-                The poky-image-basic and poky-image-lsb images both include OpenSSH.
+                By default, core-image-sato is configured to use Dropbear.
+                The core-image-basic and core-image-lsb images both include OpenSSH.
                 To change these defaults, edit the <filename>IMAGE_FEATURES</filename> variable
                 so that it sets the image you are working with to include ssh-server-dropbear 
                 or ssh-server-openssh.
@@ -415,7 +412,7 @@ DISTRO_EXTRA_RDEPENDS += "strace"
             </para>
             <programlisting>
 $ bitbake -c clean task-boot task-base task-poky
-$ bitbake poky-image-sato
+$ bitbake core-image-sato
             </programlisting>
         </section>
 
@@ -637,7 +634,7 @@ BBFILE_PRIORITY_emenlow = "6"
                     tree.</para></listitem>
                 </itemizedlist>
                 Following these recommendations keeps your Poky tree and its configuration entirely
-                inside POKYBASE.
+                inside COREBASE.
             </para>
         </section>
 

documentation/poky-ref-manual/faq.xml

@@ -428,39 +428,6 @@
         </answer>
     </qandaentry>
 
-    <qandaentry>
-        <question>
-            <para>
-                How do I use an external toolchain?
-            </para>
-        </question>
-        <answer>
-            <para>
-                The toolchain configuration is very flexible and customizable.
-                It is primarily controlled with the TCMODE variable.
-                This variable controls which file to include 
-                (<filename>conf/distro/include/tcmode-*.inc</filename>).
-            </para>
-            <para>
-                The default value of TCMODE is "default".
-                However, other patterns are accepted.
-                In particular, "external-*" refers to external toolchains of which there are some basic examples
-                included with the core.
-                A user can use their own custom toolchain definition in their own layer 
-                (or <filename>local.conf</filename> directory) at the location 
-                <filename>conf/distro/include/tcmode-*.inc</filename>.
-            </para>
-            <para>
-                In addition to the toolchain configuration, you also need a corresponding toolchain recipe file.
-                This recipe file needs to package up any pre-built objects in the toolchain such as 
-                <filename>libgcc</filename>, <filename>libstdcc++</filename>, 
-                any locales and <filename>libc</filename>.
-                An example is the <filename>external-csl-toolchain_2008q3-72.bb</filename>, which reuses the core 
-                <filename>libc</filename> packaging class to do most of the work.
-            </para>
-        </answer>
-    </qandaentry>
-
 
 
 

documentation/poky-ref-manual/poky-ref-manual.xml

@@ -52,16 +52,6 @@
                 <date>6 April 2011</date>
                 <revremark>Released with Yocto Project 1.0 (Bernard 5.0).</revremark>
             </revision>
-            <revision>
-                <revnumber>1.0.1</revnumber>
-                <date>23 May 2011</date>
-                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.0.2</revnumber>
-                <date>20 December 2011</date>
-                <revremark>Released with Yocto Project 1.0.2 on 20 December 2011.</revremark>
-            </revision>
         </revhistory>
 
     <copyright>

documentation/poky-ref-manual/ref-bitbake.xml

@@ -9,7 +9,7 @@
         BitBake is a program written in Python that interprets the metadata that makes up Poky. 
         At some point, people wonder what actually happens when you enter:
     <literallayout class='monospaced'>
-     $ bitbake poky-image-sato
+     $ bitbake core-image-sato
     </literallayout>
     </para>
    
@@ -111,11 +111,11 @@
 
         <para>
             Once all the <filename>.bb</filename> files have been 
-            parsed, BitBake starts to build the target (poky-image-sato in the previous section's 
+            parsed, BitBake starts to build the target (core-image-sato in the previous section's 
             example) and looks for providers of that target.
             Once a provider is selected, BitBake resolves all the dependencies for  
             the target. 
-            In the case of "poky-image-sato", it would lead to <filename>task-base.bb</filename>,  
+            In the case of "core-image-sato", it would lead to <filename>task-base.bb</filename>,  
             which in turn leads to packages like <application>Contacts</application>, 
             <application>Dates</application> and <application>BusyBox</application>.
             These packages in turn depend on glibc and the toolchain.

documentation/poky-ref-manual/ref-features.xml

@@ -211,14 +211,12 @@
         <title>Reference: Images</title>
 
         <para>
-            The contents of images generated by Poky can be controlled by the 
-            <glossterm linkend='var-IMAGE_FEATURES'><link linkend='var-IMAGE_FEATURES'>
-            IMAGE_FEATURES</link></glossterm> variable and the in local.conf and the 
-            <glossterm linkend='var-EXTRA_IMAGE_FEATURES'><link linkend='var-EXTRA_IMAGE_FEATURES'>
-            EXTRA_IMAGE_FEATURES</link></glossterm> that you typically configure in your image recipes.
-            Through these varibales you can add several different
-            predefined packages such as development utilities or packages with debug
-            information needed to investigate application problems or profile applications.
+            The contents of images generated by Poky can be controlled by the <glossterm
+        linkend='var-IMAGE_FEATURES'><link
+        linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm>
+        variable in local.conf. Through this you can add several different
+        predefined packages such as development utilities or packages with debug
+        information needed to investigate application problems or profile applications.
         </para>
 
         <para>

documentation/poky-ref-manual/ref-images.xml

@@ -28,41 +28,41 @@
     <itemizedlist>
             <listitem>
                 <para>
-                    <emphasis>poky-image-minimal</emphasis> - A small image just capable 
+                    <emphasis>core-image-minimal</emphasis> - A small image just capable 
                     of allowing a device to boot.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-base</emphasis> - A console-only image that fully 
+                    <emphasis>core-image-base</emphasis> - A console-only image that fully 
                     supports the target device hardware. 
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-core</emphasis> - An X11 image with simple 
+                    <emphasis>core-image-core</emphasis> - An X11 image with simple 
                     applications such as terminal, editor, and file manager.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-sato</emphasis> - An X11 image with Sato theme and
+                    <emphasis>core-image-sato</emphasis> - An X11 image with Sato theme and
                     Pimlico applications. 
                     The image also contains terminal, editor, and file manager.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-sato-dev</emphasis> - An X11 image similar to 
-                    poky-image-sato but
+                    <emphasis>core-image-sato-dev</emphasis> - An X11 image similar to 
+                    core-image-sato but
                     also includes a native toolchain and libraries needed to build applications 
                     on the device itself. The image also includes testing and profiling tools 
-                    as well as debug symbols.  This image was formerly poky-image-sdk.
+                    as well as debug symbols.  This image was formerly core-image-sdk.
                 </para>
             </listitem>
             <listitem>
                 <para>
-                    <emphasis>poky-image-lsb</emphasis> - An image suitable for implementations 
+                    <emphasis>core-image-lsb</emphasis> - An image suitable for implementations 
                     that conform to Linux Standard Base (LSB).
                 </para>
             </listitem>

documentation/poky-ref-manual/ref-structure.xml

@@ -28,7 +28,7 @@
             Consequently, most users do not need to worry about BitBake.
             The <filename class="directory">bitbake/bin/</filename> directory is placed 
             into the PATH environment variable by the 
-            <link linkend="structure-core-script">poky-init-build-env</link> script.
+            <link linkend="structure-core-script">oe-init-build-env</link> script.
         </para>
 
         <para>
@@ -47,7 +47,7 @@
             It is also possible to place output and configuration 
             files in a directory separate from the Poky source.
             For information on separating output from the Poky source, see <link 
-            linkend='structure-core-script'>poky-init-build-env</link>.
+            linkend='structure-core-script'>oe-init-build-env</link>.
         </para>
     </section>
 
@@ -104,7 +104,7 @@
         <para>
             This directory contains various integration scripts that implement 
             extra functionality in the Poky environment (e.g. QEMU scripts).
-            The <link linkend="structure-core-script">poky-init-build-env</link> script appends this
+            The <link linkend="structure-core-script">oe-init-build-env</link> script appends this
             directory to the PATH environment variable.
         </para>
     </section>
@@ -154,7 +154,7 @@
     </section>
 
     <section id='structure-core-script'>
-        <title><filename>poky-init-build-env</filename></title>
+        <title><filename>oe-init-build-env</filename></title>
 
         <para>
             This script sets up the Poky build environment. 
@@ -168,7 +168,7 @@
         </para>
 
         <literallayout class='monospaced'>
-     $ source POKY_SRC/poky-init-build-env [BUILDDIR]
+     $ source POKY_SRC/oe-init-build-env [BUILDDIR]
         </literallayout>
 
         <para>
@@ -314,7 +314,7 @@
 
         <para>
             This directory receives any <filename>.rpm</filename> packages produced by Poky.  
-            The packages are sorted into feeds for different architecture types.
+            The packages re sorted into feeds for different architecture types.
         </para>
     </section>
 

documentation/poky-ref-manual/ref-variables.xml

@@ -297,49 +297,6 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-EXTRA_IMAGE_FEATURES'><glossterm>EXTRA_IMAGE_FEATURES</glossterm>
-            <glossdef>
-                <para>Allows extra packages to be added to the generated images.
-                    You set this variable in the <filename>local.conf</filename>
-                    configuration file.
-                    Note that some image features are also added using the 
-                    <link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link>
-                    variable generally configured in image recipes.
-                    You can use the EXTRA_IMAGE_FEATURES variable to add more features
-                    in addition to those.
-                    Here are some exmaples of features you can add:</para>
-                    <literallayout class='monospaced'>
-"dbg-pkgs" - Adds -dbg packages for all installed packages
-             including symbol information for debugging and 
-             profiling.
-
-"dev-pkgs" - Adds -dev packages for all installed packages.  
-             This is useful if you want to develop against 
-             the libraries in the image.
-
-"tools-sdk" - Adds development tools such as gcc, make, 
-              pkgconfig and so forth.
-
-"tools-debug" - Adds debugging tools such as gdb and 
-                strace.
-
-"tools-profile" - Adds profiling tools such as oprofile, 
-                  exmap, lttng and valgrind (x86 only).
-
-"tools-testapps" - Adds useful testing tools such as ts_print, 
-                   aplay, arecord and so forth.
-
-"debug-tweaks" - Makes an image suitable for development.  
-                 For example, ssh root access has a blank 
-                 password.  There are other application 
-                 targets too, see meta/classes/poky-image.bbclass
-                 and meta/packages/tasks/task-poky.bb 
-                 for more details.
-                    </literallayout> 
-
-            </glossdef>
-        </glossentry>
-
         <glossentry id='var-EXTRA_OECMAKE'><glossterm>EXTRA_OECMAKE</glossterm>
             <glossdef>
                 <para>Additional cmake options</para>
@@ -399,11 +356,7 @@
         <glossentry id='var-IMAGE_FEATURES'><glossterm>IMAGE_FEATURES</glossterm>
             <glossdef>
                 <para><link linkend="ref-features-image">List of
-                features</link> present in resulting images.
-                Typically you configure this variable in image recipes.
-                Note that you can add extra features to the image by using the
-                <link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link>
-                variable.</para>
+                features</link> present in resulting images</para>
             </glossdef>
         </glossentry>
 

documentation/poky-ref-manual/ref-varlocality.xml

@@ -97,7 +97,7 @@
                 <para><glossterm linkend='var-BBFILES'><link linkend='var-BBFILES'>BBFILES</link></glossterm></para>
             </listitem>
             <listitem>
-                <para><glossterm linkend='var-EXTRA_IMAGE_FEATURES'><link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link></glossterm></para>
+                <para><glossterm linkend='var-IMAGE_FEATURES'><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm></para>
             </listitem>
             <listitem>
                 <para><glossterm linkend='var-PACKAGE_CLASSES'><link linkend='var-PACKAGE_CLASSES'>PACKAGE_CLASSES</link></glossterm></para>

documentation/poky-ref-manual/usingpoky.xml

@@ -73,14 +73,6 @@
             So for example, before building <filename>matchbox-desktop</filename> BitBake
             would build a cross compiler and glibc if they had not already been built.
         </para>
-        <para>
-            A useful BitBake option to consider is the <filename>-k</filename> or 
-            <filename>&dash;&dash;continue</filename> option.  
-            This option instructs BitBake to try and continue processing the job as much 
-            as possible even after encountering an error.  When an error occurs the target that
-            failed and those that depend on it cannot be remade.  However, when you use this
-            option other dependencies can still be processed.
-        </para>
 
     </section>
 
@@ -139,14 +131,14 @@
     </para>
     <para>
         <literallayout class='monospaced'>
-     $ source poky-init-build-env [build_dir]
+     $ source oe-init-build-env [build_dir]
         </literallayout>
     </para>
     <para>
         The build_dir is the dir containing all the build's object files. The default 
         build dir is poky-dir/build. A different build_dir can be used for each of the targets. 
         For example, ~/build/x86 for a qemux86 target, and ~/build/arm for a qemuarm target.
-        Please refer to <link linkend="structure-core-script">poky-init-build-env</link>
+        Please refer to <link linkend="structure-core-script">oe-init-build-env</link>
         for more detailed information.
     </para>
     <para>

documentation/yocto-project-qs/Makefile

@@ -0,0 +1,34 @@
+XSLTOPTS = --stringparam html.stylesheet style.css \
+         --xinclude
+
+XSL_BASE_URI  = http://docbook.sourceforge.net/release/xsl/current
+XSL_XHTML_URI = $(XSL_BASE_URI)/xhtml/docbook.xsl
+
+all: html tarball
+
+##
+# These URI should be rewritten by your distribution's xml catalog to
+# match your localy installed XSL stylesheets.
+
+html:
+#       See http://www.sagehill.net/docbookxsl/HtmlOutput.html 
+
+#	xsltproc $(XSLTOPTS) -o yocto-project-qs.html $(XSL_XHTML_URI) yocto-project-qs.xml
+	xsltproc $(XSLTOPTS) -o yocto-project-qs.html yocto-project-qs-customization.xsl yocto-project-qs.xml
+
+tarball: html
+	tar -cvzf yocto-project-qs.tgz yocto-project-qs.html style.css figures/yocto-environment.png figures/building-an-image.png figures/using-a-pre-built-image.png figures/yocto-project-transp.png
+
+validate:
+	xmllint --postvalid --xinclude --noout yocto-project-qs.xml
+
+MANUALS = yocto-project-qs.html
+FIGURES = figures/*.png
+STYLESHEET = *.css
+
+publish:
+	scp -r $(MANUALS) $(STYLESHEET) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/yocto-quick-start
+	scp -r $(FIGURES) www.yoctoproject.org:/srv/www/www.yoctoproject.org-docs/yocto-quick-start/figures
+
+clean:
+	rm -f $(MANUALS)

documentation/yocto-project-qs/yocto-project-qs.xml

@@ -188,15 +188,10 @@
         <title>Yocto Project Release</title>
             
         <para>
-            You can download the latest release images for the Yocto Project on the 
-            <ulink url="http://yoctoproject.org/download">Yocto Project Download page</ulink>.
-            Just go to the page and click the "Yocto Downloads" link found in the "Download"
-            navigation pane to the right to view all available Yocto Project releases. 
-            Then, click the "Yocto Release" link for the release you want from the list to 
-            begin the download. 
-            Nightly and developmental builds are also maintained at
-            <ulink url="http://autobuilder.yoctoproject.org/nightly/"></ulink>.  
-            However, for this document a released version of Yocto Project is used.
+            The latest release images for the Yocto Project are kept at 
+            <ulink url="http://yoctoproject.org/downloads/yocto-1.0/"></ulink>.
+            Nightly and developmental builds are also maintained.  However, for this 
+            document a released version of Yocto Project is used.
         </para>
     </section>
 </section>
@@ -258,9 +253,9 @@
 
          <para>
              <literallayout class='monospaced'>
-     $ wget http://www.yoctoproject.org/downloads/poky/poky-bernard-5.0.2.tar.bz2
-     $ tar xjf poky-bernard-5.0.2.tar.bz2
-     $ source poky-bernard-5.0.2/poky-init-build-env poky-5.0.2-build
+     $ wget http://www.yoctoproject.org/downloads/poky/poky-bernard-5.0.tar.bz2
+     $ tar xjf poky-bernard-5.0.tar.bz2
+     $ source poky-bernard-5.0/oe-init-build-env poky-5.0-build
              </literallayout>
          </para>
 
@@ -278,8 +273,8 @@
              <listitem><para>The first two commands extract the Yocto Project files from the 
              release tarball and place them into a subdirectory of your current directory.</para></listitem>
              <listitem><para>The <command>source</command> command creates the 
-             <filename>poky-5.0.2-build</filename> directory and executes the <command>cd</command>
-             command to make <filename>poky-5.0.2-build</filename> the working directory.
+             <filename>poky-5.0-build</filename> directory and executes the <command>cd</command>
+             command to make <filename>poky-5.0-build</filename> the working directory.
              The resulting build directory contains all the files created during the build.   
              By default the target architecture is qemux86.
              To change this default, edit the value of the MACHINE variable in the 
@@ -295,12 +290,8 @@
          <para>
              Continue with the following command to build an OS image for the target, which is 
              <filename>poky-image-sato</filename> in this example.
-             For information on the <filename>&dash;k</filename> option use the 
-             <filename>bitbake &dash;&dash;help</filename> command or see
-             <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html#usingpoky-components-bitbake'>
-             BitBake</ulink> section in the Poky Reference Manual.
              <literallayout class='monospaced'>
-     $ bitbake -k poky-image-sato
+     $ bitbake poky-image-sato
              </literallayout>
              <note><para>
                  BitBake requires Python 2.6.  For more information on this requirement, 
@@ -310,7 +301,7 @@
              </para></note>
              The final command runs the image:
              <literallayout class='monospaced'>
-     $ poky-qemu qemux86
+     $ runqemu qemux86
              </literallayout>
              <note><para>
                  Depending on the number of processors and cores, the amount or RAM, the speed of your
@@ -375,7 +366,7 @@
         <section id='installing-the-toolchain'>
         <title>Installing the Toolchain</title>
          <para>
-             You can download the pre-built toolchain, which includes the poky-qemu script and 
+             You can download the pre-built toolchain, which includes the runqemu script and 
              support files, from 
              <ulink url='http://yoctoproject.org/downloads/yocto-1.0/toolchain/'></ulink>.  
              Toolchains are available for 32-bit and 64-bit development systems from the 
@@ -490,7 +481,7 @@
          </para>
 
          <literallayout class='monospaced'>
-     $ poky-qemu &lt;<emphasis>qemuarch</emphasis>&gt; &lt;<emphasis>kernel</emphasis>&gt; &lt;<emphasis>filesystem_image</emphasis>&gt;
+     $ runqemu &lt;<emphasis>qemuarch</emphasis>&gt; &lt;<emphasis>kernel</emphasis>&gt; &lt;<emphasis>filesystem_image</emphasis>&gt;
 
      Where:
          &lt;<emphasis>qemuarch</emphasis>&gt; is a string representing the target architecture: qemux86, qemux86-64, 
@@ -510,7 +501,7 @@
 
          <literallayout class='monospaced'>
      $ source /opt/poky/environment-setup-i686-poky-linux 
-     $ poky-qemu qemux86 zImage-2.6.34-qemux86-1.0.bin yocto-image-sdk-qemux86-1.0.rootfs.ext3
+     $ runqemu qemux86 zImage-2.6.34-qemux86-1.0.bin yocto-image-sdk-qemux86-1.0.rootfs.ext3
          </literallayout>
 
          <para>

meta-demoapps/recipes-connectivity/libetpan/files/cxx-is-here.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  configure.ac |    1 +
  1 file changed, 1 insertion(+)

meta-demoapps/recipes-connectivity/openswan/openswan_2.4.7.bb

@@ -6,8 +6,7 @@ HOMEPAGE = "http://www.openswan.org"
 LICENSE = "GPLv2"
 DEPENDS = "gmp flex-native"
 RRECOMMENDS_${PN} = "kernel-module-ipsec"
-RDEPENDS_${PN}_nylon = "perl"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.openswan.org/download/old/openswan-${PV}.tar.gz \
 	   file://openswan-2.4.7-gentoo.patch;patch=1 \

meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/build-in-src.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  cmake/OpenSyncInternal.cmake.in |    1 -
  1 file changed, 1 deletion(-)

meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/cmake.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  opensync/CMakeLists.txt |    1 -
  1 file changed, 1 deletion(-)

meta-demoapps/recipes-connectivity/opensync/libopensync-0.37/no-python-check.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  CMakeLists.txt |    1 -
  1 file changed, 1 deletion(-)

meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-evolution2/0.37-fixes.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: libopensync-plugin-evolution2-0.36/cmake/modules/FindOpenSync.cmake
 ===================================================================
 --- libopensync-plugin-evolution2-0.36.orig/cmake/modules/FindOpenSync.cmake	2008-10-20 13:07:14.000000000 +0100

meta-demoapps/recipes-connectivity/opensync/libopensync-plugin-syncml/fixerror.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [others]
+
 Index: libopensync-plugin-syncml-0.38/src/syncml_callbacks.c
 ===================================================================
 --- libopensync-plugin-syncml-0.38.orig/src/syncml_callbacks.c	2009-07-31 10:30:33.000000000 +0100

meta-demoapps/recipes-connectivity/opensync/libsyncml/build-in-src.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  CMakeLists.txt |    4 ----
  1 file changed, 4 deletions(-)

meta-demoapps/recipes-connectivity/telepathy/empathy/no-gnome-doc.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
 ---
  Makefile.am      |    2 +-
  configure.ac     |    1 -

meta-demoapps/recipes-gnome/abiword/abiword_cvs.bb

@@ -1,5 +1,6 @@
 require abiword.inc
 
+SRCDATE = "20070130"
 PV="2.5.0+cvs${SRCDATE}"
 PR = "r4"
 

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: gnome-settings-daemon-2.26.1/configure.ac
 ===================================================================
 --- gnome-settings-daemon-2.26.1.orig/configure.ac	2009-09-16 22:57:31.000000000 +0100

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 --- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~	2009-04-24 20:59:51.000000000 -0700
 +++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in	2009-04-24 20:59:51.000000000 -0700
 @@ -2,7 +2,7 @@

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 ============================================================
  Listen for DeviceAdded in addition to DeviceEnabled
 

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: gnome-settings-daemon-2.25.90/configure.ac
 ===================================================================
 --- gnome-settings-daemon-2.25.90.orig/configure.ac

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c
 index f84cfad..e8f474a 100644
 --- a/plugins/housekeeping/gsd-housekeeping-manager.c

meta-demoapps/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 diff --git a/configure.ac b/configure.ac
 index 135f2ce..ba737a5 100644
 --- a/configure.ac

meta-demoapps/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch

@@ -3,6 +3,8 @@ From: Seán de Búrca <leftmostcat@gmail.com>
 Date: Fri, 07 Aug 2009 00:38:52 +0000
 Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master
 
+Upstream-Status: Inappropriate [configuration]
+
 ---
 diff --git a/help/el/el.po b/help/el/el.po
 index ab77264..635b68f 100644

meta-demoapps/recipes-gnome/gnome/libgnomekbd_2.26.0.bb

@@ -1,7 +1,7 @@
 DESCRIPTION = "GNOME keyboard library"
 LICENSE = "LGPL"
 
-DEPENDS = "gconf-dbus dbus libxklavier gtk+"
+DEPENDS = "gconf dbus libxklavier gtk+"
 
 inherit gnome
 

meta-demoapps/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: wv-1.2.0/wv-1.0.pc.in
 ===================================================================
 --- wv-1.2.0.orig/wv-1.0.pc.in	2008-03-19 22:25:18.000000000 +0000

meta-demoapps/recipes-graphics/clutter/table/fixes.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: table/Makefile
 ===================================================================
 --- table.orig/Makefile	2007-07-10 13:24:18.000000000 +0100

meta-demoapps/recipes-graphics/clutter/table_git.bb

@@ -3,6 +3,7 @@ require table.inc
 LIC_FILES_CHKSUM = "file://fluttr/COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
                     file://script-viewer/COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
+SRCREV = "4b267533ce16656cba4104fc39dc12709c1bdddf"
 PV = "0.3.0+git${SRCPV}"
 PR = "r1"
 

meta-demoapps/recipes-graphics/clutter/tidy/autofoo.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: tidy/doc/reference/Makefile.am
 ===================================================================
 --- tidy.orig/doc/reference/Makefile.am  2007-11-06 19:36:56.000000000 +0000

meta-demoapps/recipes-graphics/clutter/tidy/tidy-enable-tests.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: trunk/tests/Makefile.am
 ===================================================================
 --- trunk.orig/tests/Makefile.am	2008-03-04 12:22:10.000000000 +0000

meta-demoapps/recipes-graphics/clutter/tidy_git.bb

@@ -3,6 +3,7 @@ require tidy.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
                     file://tidy/tidy.h;endline=21;md5=ac342e7aac55849bf0755d79967fa3e8"
 
+SRCREV = "e25416e1293e1074bfa6727c80527dcff5b1f3cb"
 PV = "0.1.0+git${SRCPV}"
 PR = "r7"
 

meta-demoapps/recipes-graphics/libxklavier/libxklavier/pkgconfigfix.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: libxklavier-3.7/libxklavier.pc.in
 ===================================================================
 --- libxklavier-3.7.orig/libxklavier.pc.in	2009-06-10 15:58:46.000000000 +0100

meta-demoapps/recipes-graphics/xorg-app/xev/diet-x11.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
 ---
  xev.c |   16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)

meta-demoapps/recipes-graphics/xorg-lib/liblbxutil/mkg3states.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 During the build process the mkg3states binary needs to be run. This patch
 allows it to be built with the build systems gcc allowing this to work.
 

meta-demoapps/recipes-graphics/xournal/files/ldflags.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 ---
  src/Makefile.am |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

meta-demoapps/recipes-graphics/xournal/files/no-printing.diff

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in
 --- xournal-0.2/configure.in	2006-01-29 22:25:10.000000000 +0000
 +++ xournal-0.2.noprint/configure.in	2006-03-17 13:08:01.000000000 +0000

meta-demoapps/recipes-kernel/fuse/fuse-2.7.2/not-run-updaterc.d-on-host.patch

@@ -1,15 +0,0 @@
-Index: fuse-2.7.2/util/Makefile.am
-===================================================================
---- fuse-2.7.2.orig/util/Makefile.am	2007-04-26 01:36:47.000000000 +0930
-+++ fuse-2.7.2/util/Makefile.am	2008-02-10 16:43:19.000000000 +1030
-@@ -33,10 +33,6 @@
- 	$(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
- 	$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
- 	$(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
--	@if test -x /usr/sbin/update-rc.d; then \
--		echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
--		/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
--	fi
- 
- install-data-local:
- 	$(mkdir_p) $(DESTDIR)$(UDEV_RULES_PATH)

meta-demoapps/recipes-kernel/fuse/fuse.inc

@@ -1,13 +0,0 @@
-DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
-HOMEPAGE = "http://fuse.sf.net"
-LICENSE = "GPL"
-DEPENDS = "virtual/fakeroot-native"
-RRECOMMENDS_fuse = "${@base_contains("MACHINE_FEATURES","kernel26","kernel-module-fuse","fuse-module",d)}"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-fakeroot do_install() {
-	oe_runmake install DESTDIR=${D}
-}

meta-demoapps/recipes-kernel/fuse/fuse_2.7.2.bb

@@ -1,22 +0,0 @@
-require fuse.inc
-
-PR = "r0"
-
-SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1"
-
-EXTRA_OECONF = " --disable-kernel-module"
-
-#package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils
-PACKAGES =+ "fuse-utils-dbg fuse-utils libulockmgr libulockmgr-dev libulockmgr-dbg"
-FILES_${PN} += "${libdir}/libfuse.so.*"
-FILES_${PN}-dev += "${libdir}/libfuse*.la"
-
-FILES_libulockmgr = "${libdir}/libulockmgr.so.*"
-FILES_libulockmgr-dev += "${libdir}/libulock*.la"
-FILES_libulockmgr-dbg += "${libdir}/.debug/libulock*"
-
-FILES_fuse-utils = "${bindir} ${base_sbindir}"
-FILES_fuse-utils-dbg = "${bindir}/.debug ${base_sbindir}/.debug"
-DEBIAN_NOAUTONAME_fuse-utils = "1"
-DEBIAN_NOAUTONAME_fuse-utils-dbg = "1"
-

meta-demoapps/recipes-sato/claws-mail/files/desktop.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: claws-mail-2.9.1/claws-mail.desktop
 ===================================================================
 --- claws-mail-2.9.1.orig/claws-mail.desktop	2007-04-24 17:40:20.000000000 +0100

meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Remove duplicate file entries as this breaks install with new Automake
 
 JL 19/03/10

meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
 Index: claws-mail-2.9.1/src/addressbook.c
 ===================================================================
 --- claws-mail-2.9.1.orig/src/addressbook.c	2007-04-25 10:18:13.000000000 +0100

meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
 Index: claws-mail-2.9.1/src/mainwindow.c
 ===================================================================
 --- claws-mail-2.9.1.orig/src/mainwindow.c	2007-04-25 07:40:10.000000000 +0100

meta-demoapps/recipes-sato/clipboard-manager/files/daemonize.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
 Index: 0.6.4/manager.c
 ===================================================================
 --- 0.6.4.orig/manager.c	2007-06-28 12:23:37.000000000 +0100

meta-demoapps/recipes-sato/clipboard-manager/files/makefile.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Index: 0.6.4/Makefile.am
 ===================================================================
 --- 0.6.4.orig/Makefile.am	2007-06-28 12:23:37.000000000 +0100

meta-demoapps/recipes-sato/clipboard-manager/files/script.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [disable feature]
+
 Index: 0.6.4/clipboard.sh
 ===================================================================
 --- 0.6.4.orig/clipboard.sh	2007-06-28 12:23:37.000000000 +0100

meta-demoapps/recipes-sato/epdfview/epdfview/owl-menus.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [enable feature]
+
 Index: epdfview-0.1.7/src/Makefile.am
 ===================================================================
 --- epdfview-0.1.7.orig/src/Makefile.am	2010-07-13 12:30:44.014172385 +0100

meta-demoapps/recipes-sato/kf/files/fix-configure.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 diff -urNd ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in kf-0.5.4.1/configure.in
 --- ../kf-0.5.4.1-r0/kf-0.5.4.1/configure.in	2005-04-27 19:42:49.000000000 +0100
 +++ kf-0.5.4.1/configure.in	2005-09-29 14:12:32.000000000 +0100

meta-demoapps/recipes-sato/kf/files/fix-desktop-file.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
 Common subdirectories: kf-0.5.4.1.orig/data and kf-0.5.4.1/data
 diff -u kf-0.5.4.1.orig/kf.desktop kf-0.5.4.1/kf.desktop
 --- kf-0.5.4.1.orig/kf.desktop	2005-04-19 22:08:44.000000000 +0100

meta-demoapps/recipes-sato/kf/files/gcc4.patch

@@ -1,3 +1,5 @@
+Upstream-Status: Pending
+
 Index: kf-0.5.4.1/src/jispman.c
 ===================================================================
 --- kf-0.5.4.1.orig/src/jispman.c	2006-12-03 15:33:47.000000000 +0100

meta-demoapps/recipes-sato/matchbox-themes-extra/matchbox-themes-extra_git.bb

@@ -2,11 +2,12 @@ DESCRIPTION = "Matchbox window manager extra themes"
 LICENSE = "GPL"
 DEPENDS = "matchbox-wm"
 SECTION = "x11/wm"
+SRCREV = "f848f9e4e577d5b9719f05b5152df1ce59399f5c"
 PV = "0.3+git${SRCPV}"
 
 LIC_FILES_CHKSUM = "file://configure.ac;endline=7;md5=3c4e087662e37f10e469425f3a0ad225"
 
-SRC_URI = "git://git.pokylinux.org/${PN};protocol=git"
+SRC_URI = "git://git.yoctoproject.org/${PN};protocol=git"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig

meta-demoapps/recipes-support/openobex/openobex_1.5.bb

@@ -7,7 +7,7 @@ DEPENDS = "libusb bluez4"
 LICENSE = "GPL"
 PR = "r4"
 
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/bluetooth/openobex-${PV}.tar.gz \
+SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/openobex-${PV}.tar.gz \
            file://disable-cable-test.patch;patch=1 \
 	   file://libusb_crosscompile_check.patch;patch=1"