poky.conf: Pre-release bump of DISTRO_VERSION

In order for us to create the adtrepo prior to release, we need to
set DISTRO_VERSION correctly. Also, verified that PRE_MIRRORS and
MIRRORS were set.

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>

.gitignore

@@ -9,9 +9,11 @@ build*/pyshtables.py
 pstage/
 scripts/oe-git-proxy-socks
 sources/
-meta-*
-!meta-skeleton
-!meta-demoapps
+meta-darwin
+meta-maemo
+meta-extras
+meta-m2
+meta-prvt*
 *.swp
 *.orig
 *.rej

README.hardware

@@ -68,12 +68,12 @@ Intel Atom based PCs and devices (atom-pc)
 
 The atom-pc MACHINE is tested on the following platforms:
 
-  o Asus EeePC 901
+  o Asus eee901
   o Acer Aspire One
   o Toshiba NB305
   o Intel Embedded Development Board 1-N450 (Black Sand)
 
-and is likely to work on many unlisted Atom based devices. The MACHINE type
+and is likely to work on many unlisted atom based devices. The MACHINE type
 supports ethernet, wifi, sound, and i915 graphics by default in addition to
 common PC input devices, busses, and so on.
 
@@ -83,18 +83,26 @@ straightforward with a caveat for USB devices. The following examples assume the
 target boot device is /dev/sdb, be sure to verify this and use the correct
 device as the following commands are run as root and are not reversable.
 
-USB Device:
-  1. Build a live image. This image type consists of a simple filesystem
-     without a partition table, which is suitable for USB keys, and with the
-     default setup for the atom-pc machine, this image type is built
-     automatically for any image you build. For example:
+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 core-image-minimal
+     $ bitbake core-image-minimal-directdisk
+  
+  2. Use the "dd" utility to write the image to the raw block device. For example:
+
+     # 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 core-image-minimal-live
 
   2. Use the "dd" utility to write the image to the raw block device. For
      example:
 
-     # dd if=core-image-minimal-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
@@ -118,7 +126,7 @@ USB Device:
 
      b. Copy the contents of the poky image to the USB-ZIP mode device:
 
-     # mount -o loop core-image-minimal-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
 
@@ -142,7 +150,7 @@ 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 & B
+  o Beagleboard xM Rev A
 
 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

bitbake/bin/bitbake-runtask

@@ -4,10 +4,6 @@ import os
 import sys
 import warnings
 sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), 'lib'))
-from bb import fetch2
-import logging
-
-logger = logging.getLogger("BitBake")
 
 try:
     import cPickle as pickle
@@ -20,20 +16,13 @@ class BBConfiguration(object):
     Manages build options and configurations for one run
     """
 
-    def __init__(self, **options):
-        self.data = {}
-        self.file = []
-        self.cmd = None
-        self.dump_signatures = True
-        self.prefile = []
-        self.postfile = []
-        self.parse_only = True
-
-    def __getattr__(self, attribute):
-        try:
-            return super(BBConfiguration, self).__getattribute__(attribute)
-        except AttributeError:
-            return None
+    def __init__(self, debug, debug_domains):
+        setattr(self, "data", {})
+        setattr(self, "file", [])
+        setattr(self, "cmd", None)
+        setattr(self, "dump_signatures", True)
+        setattr(self, "debug", debug)
+        setattr(self, "debug_domains", debug_domains)
 
 _warnings_showwarning = warnings.showwarning
 def _showwarning(message, category, filename, lineno, file=None, line=None):
@@ -50,70 +39,82 @@ warnings.showwarning = _showwarning
 warnings.simplefilter("ignore", DeprecationWarning)
 
 import bb.event
+
+# Need to map our I/O correctly. stdout is a pipe to the server expecting 
+# events. We save this and then map stdout to stderr.
+
+eventfd = os.dup(sys.stdout.fileno())
+bb.event.worker_pipe = os.fdopen(eventfd, 'w', 0)
+
+# map stdout to stderr
+os.dup2(sys.stderr.fileno(), sys.stdout.fileno())
+
+# Replace those fds with our own
+#logout = data.expand("${TMPDIR}/log/stdout.%s" % os.getpid(), self.cfgData, True)
+#mkdirhier(os.path.dirname(logout))
+#newso = open("/tmp/stdout.%s" % os.getpid(), 'w')
+#os.dup2(newso.fileno(), sys.stdout.fileno())
+#os.dup2(newso.fileno(), sys.stderr.fileno())
+
+# Don't read from stdin from the parent
+si = file("/dev/null", 'r')
+os.dup2(si.fileno( ), sys.stdin.fileno( ))
+
+# We don't want to see signals to our parent, e.g. Ctrl+C
+os.setpgrp()
+
+# Save out the PID so that the event can include it the
+# events
+bb.event.worker_pid = os.getpid()
+bb.event.useStdout = False
+
+hashfile = sys.argv[1]
+buildfile = sys.argv[2]
+taskname = sys.argv[3]
+
 import bb.cooker
 
-buildfile = sys.argv[1]
-taskname = sys.argv[2]
-if len(sys.argv) >= 4:
-    dryrun = sys.argv[3]    
-else:
-    dryrun = False
-if len(sys.argv) >= 5:
-    hashfile = sys.argv[4]
-    p = pickle.Unpickler(file(hashfile, "rb"))
-    hashdata = p.load()
-else:
-    hashdata = None
+p = pickle.Unpickler(file(hashfile, "rb"))
+hashdata = p.load()
 
-handler = bb.event.LogHandler()
-logger.addHandler(handler)
+debug = hashdata["msg-debug"]
+debug_domains = hashdata["msg-debug-domains"]
+verbose = hashdata["verbose"]
 
-#An example to make debug log messages show up
-#bb.msg.init_msgconfig(True, 3, [])
+bb.utils.init_logger(bb.msg, verbose, debug, debug_domains)
 
-console = logging.StreamHandler(sys.stdout)
-format = bb.msg.BBLogFormatter("%(levelname)s: %(message)s")
-bb.msg.addDefaultlogFilter(console)
-console.setFormatter(format)
+cooker = bb.cooker.BBCooker(BBConfiguration(debug, debug_domains), None)
+cooker.parseConfiguration()
 
-def worker_fire(event, d):
-    if isinstance(event, logging.LogRecord):
-        console.handle(event)
-bb.event.worker_fire = worker_fire
-bb.event.worker_pid = os.getpid()
+cooker.bb_cache = bb.cache.init(cooker)
+cooker.status = bb.cache.CacheData()
 
-initialenv = os.environ.copy()
-config = BBConfiguration()
-
-def register_idle_function(self, function, data):
-    pass
-
-cooker = bb.cooker.BBCooker(config, register_idle_function, initialenv)
-config_data = cooker.configuration.data
-cooker.status = config_data
-cooker.handleCollections(bb.data.getVar("BBFILE_COLLECTIONS", config_data, 1))
-
-fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile)
+(fn, cls) = cooker.bb_cache.virtualfn2realfn(buildfile)
 buildfile = cooker.matchFile(fn)
-fn = bb.cache.Cache.realfn2virtual(buildfile, cls)
+fn = cooker.bb_cache.realfn2virtual(buildfile, cls)
 
 cooker.buildSetVars()
 
 # Load data into the cache for fn and parse the loaded cache data
-the_data = bb.cache.Cache.loadDataFull(fn, cooker.get_file_appends(fn), cooker.configuration.data)
+the_data = cooker.bb_cache.loadDataFull(fn, cooker.get_file_appends(fn), cooker.configuration.data)
+cooker.bb_cache.setData(fn, buildfile, the_data)
+cooker.bb_cache.handle_data(fn, cooker.status)
+
+#exportlist = bb.utils.preserved_envvars_export_list()
+#bb.utils.filter_environment(exportlist)
 
 if taskname.endswith("_setscene"):
     the_data.setVarFlag(taskname, "quieterrors", "1")
 
-if hashdata:
-    bb.parse.siggen.set_taskdata(hashdata["hashes"], hashdata["deps"])
-    for h in hashdata["hashes"]:
-        bb.data.setVar("BBHASH_%s" % h, hashdata["hashes"][h], the_data)
-    for h in hashdata["deps"]:
-        bb.data.setVar("BBHASHDEPS_%s" % h, hashdata["deps"][h], the_data)
+bb.parse.siggen.set_taskdata(hashdata["hashes"], hashdata["deps"])
+
+for h in hashdata["hashes"]:
+    bb.data.setVar("BBHASH_%s" % h, hashdata["hashes"][h], the_data)
+for h in hashdata["deps"]:
+    bb.data.setVar("BBHASHDEPS_%s" % h, hashdata["deps"][h], the_data)
 
 ret = 0
-if dryrun != "True":
+if sys.argv[4] != "True":
     ret = bb.build.exec_task(fn, taskname, the_data)
 sys.exit(ret)
 

bitbake/lib/bb/build.py

@@ -149,7 +149,8 @@ def exec_func(func, d, dirs = None):
         adir = dirs[-1]
     else:
         adir = data.getVar('B', d, 1)
-        bb.utils.mkdirhier(adir)
+        if not os.path.exists(adir):
+            adir = None
 
     ispython = flags.get('python')
     if flags.get('fakeroot') and not flags.get('task'):
@@ -222,7 +223,7 @@ def exec_func_shell(function, d, runfile, cwd=None):
 
     with open(runfile, 'w') as script:
         script.write('#!/bin/sh -e\n')
-        if bb.msg.loggerDefaultVerbose:
+        if bb.msg.loggerVerbose:
             script.write("set -x\n")
         data.emit_func(function, script, d)
         if cwd:
@@ -233,7 +234,7 @@ def exec_func_shell(function, d, runfile, cwd=None):
 
     cmd = runfile
 
-    if bb.msg.loggerDefaultVerbose:
+    if bb.msg.loggerVerbose:
         logfile = LogTee(logger, sys.stdout)
     else:
         logfile = sys.stdout

bitbake/lib/bb/codeparser.py

@@ -150,79 +150,117 @@ def parser_cache_savemerge(d):
     bb.utils.unlockfile(glf)
 
 
-Logger = logging.getLoggerClass()
-class BufferedLogger(Logger):
-    def __init__(self, name, level=0, target=None):
-        Logger.__init__(self, name)
-        self.setLevel(level)
-        self.buffer = []
-        self.target = target
-
-    def handle(self, record):
-        self.buffer.append(record)
-
-    def flush(self):
-        for record in self.buffer:
-            self.target.handle(record)
-        self.buffer = []
-
 class PythonParser():
-    getvars = ("d.getVar", "bb.data.getVar", "data.getVar")
-    execfuncs = ("bb.build.exec_func", "bb.build.exec_task")
-
-    def warn(self, func, arg):
-        """Warn about calls of bitbake APIs which pass a non-literal
-        argument for the variable name, as we're not able to track such
-        a reference.
+    class ValueVisitor():
+        """Visitor to traverse a python abstract syntax tree and obtain
+        the variables referenced via bitbake metadata APIs, and the external
+        functions called.
         """
 
-        try:
-            funcstr = codegen.to_source(func)
-            argstr = codegen.to_source(arg)
-        except TypeError:
-            self.log.debug(2, 'Failed to convert function and argument to source form')
-        else:
-            self.log.debug(1, self.unhandled_message % (funcstr, argstr))
+        getvars = ("d.getVar", "bb.data.getVar", "data.getVar")
+        expands = ("d.expand", "bb.data.expand", "data.expand")
+        execs = ("bb.build.exec_func", "bb.build.exec_task")
 
-    def visit_Call(self, node):
-        name = self.called_node_name(node.func)
-        if name in self.getvars:
-            if isinstance(node.args[0], ast.Str):
-                self.var_references.add(node.args[0].s)
-            else:
-                self.warn(node.func, node.args[0])
-        elif name in self.execfuncs:
-            if isinstance(node.args[0], ast.Str):
-                self.var_execs.add(node.args[0].s)
-            else:
-                self.warn(node.func, node.args[0])
-        elif name and isinstance(node.func, (ast.Name, ast.Attribute)):
-            self.execs.add(name)
+        @classmethod
+        def _compare_name(cls, strparts, node):
+            """Given a sequence of strings representing a python name,
+            where the last component is the actual Name and the prior
+            elements are Attribute nodes, determine if the supplied node
+            matches.
+            """
 
-    def called_node_name(self, node):
-        """Given a called node, return its original string form"""
-        components = []
-        while node:
+            if not strparts:
+                return True
+
+            current, rest = strparts[0], strparts[1:]
             if isinstance(node, ast.Attribute):
-                components.append(node.attr)
-                node = node.value
+                if current == node.attr:
+                    return cls._compare_name(rest, node.value)
             elif isinstance(node, ast.Name):
-                components.append(node.id)
-                return '.'.join(reversed(components))
+                if current == node.id:
+                    return True
+            return False
+
+        @classmethod
+        def compare_name(cls, value, node):
+            """Convenience function for the _compare_node method, which
+            can accept a string (which is split by '.' for you), or an
+            iterable of strings, in which case it checks to see if any of
+            them match, similar to isinstance.
+            """
+
+            if isinstance(value, basestring):
+                return cls._compare_name(tuple(reversed(value.split("."))),
+                                         node)
             else:
-                break
+                return any(cls.compare_name(item, node) for item in value)
 
-    def __init__(self, name, log):
-        self.var_references = set()
-        self.var_execs = set()
+        def __init__(self, value):
+            self.var_references = set()
+            self.var_execs = set()
+            self.direct_func_calls = set()
+            self.var_expands = set()
+            self.value = value
+
+        @classmethod
+        def warn(cls, func, arg):
+            """Warn about calls of bitbake APIs which pass a non-literal
+            argument for the variable name, as we're not able to track such
+            a reference.
+            """
+
+            try:
+                funcstr = codegen.to_source(func)
+                argstr = codegen.to_source(arg)
+            except TypeError:
+                logger.debug(2, 'Failed to convert function and argument to source form')
+            else:
+                logger.debug(1, "Warning: in call to '%s', argument '%s' is "
+                                "not a literal", funcstr, argstr)
+
+        def visit_Call(self, node):
+            if self.compare_name(self.getvars, node.func):
+                if isinstance(node.args[0], ast.Str):
+                    self.var_references.add(node.args[0].s)
+                else:
+                    self.warn(node.func, node.args[0])
+            elif self.compare_name(self.expands, node.func):
+                if isinstance(node.args[0], ast.Str):
+                    self.warn(node.func, node.args[0])
+                    self.var_expands.update(node.args[0].s)
+                elif isinstance(node.args[0], ast.Call) and \
+                     self.compare_name(self.getvars, node.args[0].func):
+                    pass
+                else:
+                    self.warn(node.func, node.args[0])
+            elif self.compare_name(self.execs, node.func):
+                if isinstance(node.args[0], ast.Str):
+                    self.var_execs.add(node.args[0].s)
+                else:
+                    self.warn(node.func, node.args[0])
+            elif isinstance(node.func, ast.Name):
+                self.direct_func_calls.add(node.func.id)
+            elif isinstance(node.func, ast.Attribute):
+                # We must have a qualified name.  Therefore we need
+                # to walk the chain of 'Attribute' nodes to determine
+                # the qualification.
+                attr_node = node.func.value
+                identifier = node.func.attr
+                while isinstance(attr_node, ast.Attribute):
+                    identifier = attr_node.attr + "." + identifier
+                    attr_node = attr_node.value
+                if isinstance(attr_node, ast.Name):
+                    identifier = attr_node.id + "." + identifier
+                self.direct_func_calls.add(identifier)
+
+    def __init__(self):
+        #self.funcdefs = set()
         self.execs = set()
+        #self.external_cmds = set()
         self.references = set()
-        self.log = BufferedLogger('BitBake.Data.%s' % name, logging.DEBUG, log)
-
-        self.unhandled_message = "in call of %s, argument '%s' is not a string literal"
-        self.unhandled_message = "while parsing %s, %s" % (name, self.unhandled_message)
 
     def parse_python(self, node):
+
         h = hash(str(node))
 
         if h in pythonparsecache:
@@ -233,25 +271,24 @@ class PythonParser():
         code = compile(check_indent(str(node)), "<string>", "exec",
                        ast.PyCF_ONLY_AST)
 
+        visitor = self.ValueVisitor(code)
         for n in ast.walk(code):
             if n.__class__.__name__ == "Call":
-                self.visit_Call(n)
+                visitor.visit_Call(n)
 
-        self.references.update(self.var_references)
-        self.references.update(self.var_execs)
+        self.references.update(visitor.var_references)
+        self.references.update(visitor.var_execs)
+        self.execs = visitor.direct_func_calls
 
         pythonparsecache[h] = {}
         pythonparsecache[h]["refs"] = self.references
         pythonparsecache[h]["execs"] = self.execs
 
 class ShellParser():
-    def __init__(self, name, log):
+    def __init__(self):
         self.funcdefs = set()
         self.allexecs = set()
         self.execs = set()
-        self.log = BufferedLogger('BitBake.Data.%s' % name, logging.DEBUG, log)
-        self.unhandled_template = "unable to handle non-literal command '%s'"
-        self.unhandled_template = "while parsing %s, %s" % (name, self.unhandled_template)
 
     def parse_shell(self, value):
         """Parse the supplied shell code in a string, returning the external
@@ -366,7 +403,8 @@ class ShellParser():
 
                 cmd = word[1]
                 if cmd.startswith("$"):
-                    self.log.debug(1, self.unhandled_template % cmd)
+                    logger.debug(1, "Warning: execution of non-literal "
+                                    "command '%s'", cmd)
                 elif cmd == "eval":
                     command = " ".join(word for _, word in words[1:])
                     self.parse_shell(command)

bitbake/lib/bb/cooker.py

@@ -244,18 +244,13 @@ class BBCooker:
         # Need files parsed
         self.updateCache()
 
-        # Need to ensure data store is expanded
-        localdata = data.createCopy(self.configuration.data)
-        bb.data.update_data(localdata)
-        bb.data.expandKeys(localdata)
-
         pkg_pn = self.status.pkg_pn
         preferred_versions = {}
         latest_versions = {}
 
         # Sort by priority
         for pn in pkg_pn:
-            (last_ver, last_file, pref_ver, pref_file) = bb.providers.findBestProvider(pn, localdata, self.status)
+            (last_ver, last_file, pref_ver, pref_file) = bb.providers.findBestProvider(pn, self.configuration.data, self.status)
             preferred_versions[pn] = (pref_ver, pref_file)
             latest_versions[pn] = (last_ver, last_file)
 
@@ -288,9 +283,7 @@ class BBCooker:
             self.status = bb.cache.CacheData(self.caches_array)
             self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) )
 
-            fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile)
-            fn = self.matchFile(fn)
-            fn = bb.cache.Cache.realfn2virtual(fn, cls)
+            fn = self.matchFile(buildfile)
         elif len(pkgs_to_build) == 1:
             self.updateCache()
 

bitbake/lib/bb/data.py

@@ -49,7 +49,6 @@ from bb import data_smart
 from bb import codeparser
 import bb
 
-logger = data_smart.logger
 _dict_type = data_smart.DataSmart
 
 def init():
@@ -259,7 +258,7 @@ def emit_func(func, o=sys.__stdout__, d = init()):
         emit_var(key, o, d, False) and o.write('\n')
 
     emit_var(func, o, d, False) and o.write('\n')
-    newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func, True))
+    newdeps = bb.codeparser.ShellParser().parse_shell(d.getVar(func, True))
     seen = set()
     while newdeps:
         deps = newdeps
@@ -268,45 +267,39 @@ def emit_func(func, o=sys.__stdout__, d = init()):
         for dep in deps:
             if bb.data.getVarFlag(dep, "func", d):
                emit_var(dep, o, d, False) and o.write('\n')
-               newdeps |=  bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep, True))
+               newdeps |=  bb.codeparser.ShellParser().parse_shell(d.getVar(dep, True))
         newdeps -= seen
 
 def update_data(d):
     """Performs final steps upon the datastore, including application of overrides"""
     d.finalize()
 
-def build_dependencies(key, keys, shelldeps, vardepvals, d):
+def build_dependencies(key, keys, shelldeps, d):
     deps = set()
-    vardeps = d.getVarFlag(key, "vardeps", True)
     try:
-        value = d.getVar(key, False)
-        if key in vardepvals:
-           value =  d.getVarFlag(key, "vardepvalue", True)
-        elif d.getVarFlag(key, "func"):
+        if d.getVarFlag(key, "func"):
             if d.getVarFlag(key, "python"):
-                parsedvar = d.expandWithRefs(value, key)
-                parser = bb.codeparser.PythonParser(key, logger)
+                parsedvar = d.expandWithRefs(d.getVar(key, False), key)
+                parser = bb.codeparser.PythonParser()
                 parser.parse_python(parsedvar.value)
                 deps = deps | parser.references
             else:
-                parsedvar = d.expandWithRefs(value, key)
-                parser = bb.codeparser.ShellParser(key, logger)
+                parsedvar = d.expandWithRefs(d.getVar(key, False), key)
+                parser = bb.codeparser.ShellParser()
                 parser.parse_shell(parsedvar.value)
                 deps = deps | shelldeps
-            if vardeps is None:
-                parser.log.flush()
             deps = deps | parsedvar.references
             deps = deps | (keys & parser.execs) | (keys & parsedvar.execs)
         else:
-            parser = d.expandWithRefs(value, key)
+            parser = d.expandWithRefs(d.getVar(key, False), key)
             deps |= parser.references
             deps = deps | (keys & parser.execs)
-        deps |= set((vardeps or "").split())
+        deps |= set((d.getVarFlag(key, "vardeps", True) or "").split())
         deps -= set((d.getVarFlag(key, "vardepsexclude", True) or "").split())
     except:
         bb.note("Error expanding variable %s" % key)
         raise
-    return deps, value
+    return deps
     #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs)))
     #d.setVarFlag(key, "vardeps", deps)
 
@@ -314,14 +307,12 @@ def generate_dependencies(d):
 
     keys = set(key for key in d.keys() if not key.startswith("__"))
     shelldeps = set(key for key in keys if d.getVarFlag(key, "export") and not d.getVarFlag(key, "unexport"))
-    vardepvals = set(key for key in keys if d.getVarFlag(key, "vardepvalue"))
 
     deps = {}
-    values = {}
 
     tasklist = bb.data.getVar('__BBTASKS', d) or []
     for task in tasklist:
-        deps[task], values[task] = build_dependencies(task, keys, shelldeps, vardepvals, d)
+        deps[task] = build_dependencies(task, keys, shelldeps, d)
         newdeps = deps[task]
         seen = set()
         while newdeps:
@@ -330,11 +321,11 @@ def generate_dependencies(d):
             newdeps = set()
             for dep in nextdeps:
                 if dep not in deps:
-                    deps[dep], values[dep] = build_dependencies(dep, keys, shelldeps, vardepvals, d)
+                    deps[dep] = build_dependencies(dep, keys, shelldeps, d)
                 newdeps |=  deps[dep]
             newdeps -= seen
         #print "For %s: %s" % (task, str(taskdeps[task]))
-    return tasklist, deps, values
+    return tasklist, deps
 
 def inherits_class(klass, d):
     val = getVar('__inherit_cache', d) or []

bitbake/lib/bb/data_smart.py

@@ -68,14 +68,8 @@ class VariableParse:
             code = match.group()[3:-1]
             codeobj = compile(code.strip(), self.varname or "<expansion>", "eval")
 
-            parser = bb.codeparser.PythonParser(self.varname, logger)
+            parser = bb.codeparser.PythonParser()
             parser.parse_python(code)
-            if self.varname:
-                vardeps = self.d.getVarFlag(self.varname, "vardeps", True)
-                if vardeps is None:
-                    parser.log.flush()
-            else:
-                parser.log.flush()
             self.references |= parser.references
             self.execs |= parser.execs
 

bitbake/lib/bb/fetch2/__init__.py

@@ -197,7 +197,6 @@ def uri_replace(ud, uri_find, uri_replace, d):
     uri_decoded = list(decodeurl(ud.url))
     uri_find_decoded = list(decodeurl(uri_find))
     uri_replace_decoded = list(decodeurl(uri_replace))
-    logger.debug(2, "For url %s comparing %s to %s" % (uri_decoded, uri_find_decoded, uri_replace_decoded))
     result_decoded = ['', '', '', '', '', {}]
     for i in uri_find_decoded:
         loc = uri_find_decoded.index(i)
@@ -210,18 +209,12 @@ def uri_replace(ud, uri_find, uri_replace, d):
                     result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc])
                 if uri_find_decoded.index(i) == 2:
                     if ud.mirrortarball:
-                        if result_decoded[loc].endswith("/"):
-                            result_decoded[loc] = os.path.dirname(result_decoded[loc])
-                        result_decoded[loc] = os.path.join(result_decoded[loc], os.path.basename(ud.mirrortarball))
+                        result_decoded[loc] = os.path.join(os.path.dirname(result_decoded[loc]), os.path.basename(ud.mirrortarball))
                     elif ud.localpath:
-                        if result_decoded[loc].endswith("/"):
-                            result_decoded[loc] = os.path.dirname(result_decoded[loc])
-                        result_decoded[loc] = os.path.join(result_decoded[loc], os.path.basename(ud.localpath))
+                        result_decoded[loc] = os.path.join(os.path.dirname(result_decoded[loc]), os.path.basename(ud.localpath))
             else:
                 return ud.url
-    result = encodeurl(result_decoded)
-    logger.debug(2, "For url %s returning %s" % (ud.url, result))
-    return result
+    return encodeurl(result_decoded)
 
 methods = []
 urldata_cache = {}
@@ -392,8 +385,7 @@ def runfetchcmd(cmd, d, quiet = False, cleanup = []):
     exportvars = ['PATH', 'GIT_PROXY_COMMAND', 'GIT_PROXY_HOST',
                   'GIT_PROXY_PORT', 'GIT_CONFIG', 'http_proxy', 'ftp_proxy',
                   'https_proxy', 'no_proxy', 'ALL_PROXY', 'all_proxy',
-                  'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME',
-                  'GIT_PROXY_IGNORE', 'SOCKS5_USER', 'SOCKS5_PASSWD']
+                  'SSH_AUTH_SOCK', 'SSH_AGENT_PID', 'HOME']
 
     for var in exportvars:
         val = bb.data.getVar(var, d, True)

bitbake/lib/bb/fetch2/git.py

@@ -190,7 +190,7 @@ class Git(FetchMethod):
                 logger.debug(1, "No Origin")
 
             runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d)
-            fetch_cmd = "%s fetch -f --prune %s refs/*:refs/*" % (ud.basecmd, repourl)
+            fetch_cmd = "%s fetch --prune %s refs/*:refs/*" % (ud.basecmd, repourl)
             bb.fetch2.check_network_access(d, fetch_cmd, ud.url)
             runfetchcmd(fetch_cmd, d)
             runfetchcmd("%s prune-packed" % ud.basecmd, d)
@@ -210,17 +210,15 @@ class Git(FetchMethod):
         subdir = ud.parm.get("subpath", "")
         if subdir != "":
             readpathspec = ":%s" % (subdir)
-            def_destsuffix = "%s/" % os.path.basename(subdir)
         else:
             readpathspec = ""
-            def_destsuffix = "git/"
 
-        destsuffix = ud.parm.get("destsuffix", def_destsuffix)
+        destsuffix = ud.parm.get("destsuffix", "git/")
         destdir = os.path.join(destdir, destsuffix)
         if os.path.exists(destdir):
             bb.utils.prunedir(destdir)
 
-        runfetchcmd("git clone -s -n %s/ %s" % (ud.clonedir, destdir), d)
+        runfetchcmd("git clone -s -n %s %s" % (ud.clonedir, destdir), d)
         if not ud.nocheckout:
             os.chdir(destdir)
             if subdir != "":
@@ -241,10 +239,7 @@ class Git(FetchMethod):
 
     def _contains_ref(self, tag, d):
         basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
-        cmd = "%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % (basecmd, tag)
-        output = runfetchcmd(cmd, d, quiet=True)
-        if len(output.split()) > 1:
-            raise bb.fetch2.FetchError("The command '%s' gave output with more then 1 line unexpectedly, output: '%s'" % (cmd, output))
+        output = runfetchcmd("%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % (basecmd, tag), d, quiet=True)
         return output.split()[0] != "0"
 
     def _revision_key(self, url, ud, d, name):
@@ -285,7 +280,7 @@ class Git(FetchMethod):
         # Check if we have the rev already
 
         if not os.path.exists(ud.clonedir):
-            logger.debug(1, "GIT repository for %s does not exist in %s.  \
+            logging.debug("GIT repository for %s does not exist in %s.  \
                           Downloading.", url, ud.clonedir)
             self.download(None, ud, d)
             if not os.path.exists(ud.clonedir):

bitbake/lib/bb/fetch2/hg.py

@@ -166,7 +166,7 @@ class Hg(FetchMethod):
         output = runfetchcmd(self._buildhgcommand(ud, d, "info"), d)
         return output.strip()
 
-    def _build_revision(self, url, ud, d, name):
+    def _build_revision(self, url, ud, d):
         return ud.revision
 
     def _revision_key(self, url, ud, d, name):

bitbake/lib/bb/fetch2/local.py

@@ -50,6 +50,9 @@ class Local(FetchMethod):
         path = url.split("://")[1]
         path = path.split(";")[0]
         newpath = path
+        dldirfile = os.path.join(data.getVar("DL_DIR", d, True), os.path.basename(path))
+        if os.path.exists(dldirfile):
+            return dldirfile
         if path[0] != "/":
             filespath = data.getVar('FILESPATH', d, True)
             if filespath:
@@ -59,7 +62,6 @@ class Local(FetchMethod):
                 if filesdir:
                     newpath = os.path.join(filesdir, path)
         if not os.path.exists(newpath) and path.find("*") == -1:
-            dldirfile = os.path.join(data.getVar("DL_DIR", d, True), os.path.basename(path))
             return dldirfile
         return newpath
 

bitbake/lib/bb/fetch2/wget.py

@@ -69,11 +69,10 @@ class Wget(FetchMethod):
 
             fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0])
             fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
-            if not checkonly:
-                logger.info("fetch " + uri)
-                logger.debug(2, "executing " + fetchcmd)
+            logger.info("fetch " + uri)
+            logger.debug(2, "executing " + fetchcmd)
             bb.fetch2.check_network_access(d, fetchcmd)
-            runfetchcmd(fetchcmd, d, quiet=checkonly)
+            runfetchcmd(fetchcmd, d)
 
             # Sanity check since wget can pretend it succeed when it didn't
             # Also, this used to happen if sourceforge sent us to the mirror page

bitbake/lib/bb/msg.py

@@ -106,8 +106,8 @@ def init_msgconfig(verbose, debug, debug_domains = []):
     """
     Set default verbosity and debug levels config the logger
     """
-    bb.msg.loggerDefaultDebugLevel = debug
-    bb.msg.loggerDefaultVerbose = verbose
+    bb.msg.loggerDebugLevel = debug
+    bb.msg.loggerVerbose = verbose
     bb.msg.loggerDefaultDomains = debug_domains
 
 def addDefaultlogFilter(handler):

bitbake/lib/bb/parse/parse_py/BBHandler.py

@@ -148,7 +148,7 @@ def handle(fn, d, include):
 
     # DONE WITH PARSING... time to evaluate
     if ext != ".bbclass":
-        data.setVar('FILE', abs_fn, d)
+        data.setVar('FILE', fn, d)
 
     statements.eval(d)
 

bitbake/lib/bb/parse/parse_py/ConfHandler.py

@@ -102,7 +102,7 @@ def handle(fn, data, include):
         feeder(lineno, s, fn, statements)
 
     # DONE WITH PARSING... time to evaluate
-    bb.data.setVar('FILE', abs_fn, data)
+    bb.data.setVar('FILE', fn, data)
     statements.eval(data)
     if oldfile:
         bb.data.setVar('FILE', oldfile, data)

bitbake/lib/bb/persist_data.py

@@ -47,10 +47,9 @@ if hasattr(sqlite3, 'enable_shared_cache'):
 @total_ordering
 class SQLTable(collections.MutableMapping):
     """Object representing a table/domain in the database"""
-    def __init__(self, cachefile, table):
-        self.cachefile = cachefile
+    def __init__(self, cursor, table):
+        self.cursor = cursor
         self.table = table
-        self.cursor = connect(self.cachefile)
 
         self._execute("CREATE TABLE IF NOT EXISTS %s(key TEXT, value TEXT);"
                       % table)
@@ -64,8 +63,6 @@ class SQLTable(collections.MutableMapping):
             except sqlite3.OperationalError as exc:
                 if 'database is locked' in str(exc) and count < 500:
                     count = count + 1
-                    self.cursor.close()
-                    self.cursor = connect(self.cachefile)
                     continue
                 raise
 
@@ -191,7 +188,7 @@ class PersistData(object):
         del self.data[domain][key]
 
 def connect(database):
-    return sqlite3.connect(database, timeout=5, isolation_level=None)
+    return sqlite3.connect(database, timeout=30, isolation_level=None)
 
 def persist(domain, d):
     """Convenience factory for SQLTable objects based upon metadata"""
@@ -204,4 +201,5 @@ def persist(domain, d):
 
     bb.utils.mkdirhier(cachedir)
     cachefile = os.path.join(cachedir, "bb_persist_data.sqlite3")
-    return SQLTable(cachefile, domain)
+    connection = connect(cachefile)
+    return SQLTable(connection, domain)

bitbake/lib/bb/runqueue.py

@@ -1203,14 +1203,8 @@ class RunQueueExecuteTasks(RunQueueExecute):
                 if task in self.rq.scenequeue_covered:
                     continue
                 if len(self.rqdata.runq_revdeps[task]) > 0 and self.rqdata.runq_revdeps[task].issubset(self.rq.scenequeue_covered):
-                    ok = True
-                    for revdep in self.rqdata.runq_revdeps[task]:
-                        if self.rqdata.runq_fnid[task] != self.rqdata.runq_fnid[revdep]:
-                            ok = False
-                            break
-                    if ok:
-                        found = True
-                        self.rq.scenequeue_covered.add(task)
+                    self.rq.scenequeue_covered.add(task)
+                    found = True
 
         # Detect when the real task needs to be run anyway by looking to see
         # if any of its dependencies within the same package are scheduled
@@ -1233,6 +1227,9 @@ class RunQueueExecuteTasks(RunQueueExecute):
 
         logger.debug(1, 'Full skip list %s', self.rq.scenequeue_covered)
 
+        for task in self.rq.scenequeue_covered:
+            self.task_skip(task)
+
         event.fire(bb.event.StampUpdate(self.rqdata.target_pairs, self.rqdata.dataCache.stamp), self.cfgData)
 
         schedulers = self.get_schedulers()
@@ -1326,14 +1323,8 @@ class RunQueueExecuteTasks(RunQueueExecute):
         task = self.sched.next()
         if task is not None:
             fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]]
+
             taskname = self.rqdata.runq_task[task]
-
-            if task in self.rq.scenequeue_covered:
-                logger.debug(2, "Setscene covered task %s (%s)", task,
-                                self.rqdata.get_user_idstring(task))
-                self.task_skip(task)
-                return True
-
             if self.rq.check_stamp_task(task, taskname):
                 logger.debug(2, "Stamp current task %s (%s)", task,
                                 self.rqdata.get_user_idstring(task))
@@ -1421,20 +1412,18 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
             sq_revdeps.append(copy.copy(self.rqdata.runq_revdeps[task]))
             sq_revdeps_new.append(set())
             if (len(self.rqdata.runq_revdeps[task]) == 0) and task not in self.rqdata.runq_setscene:
-                endpoints[task] = set()
+                endpoints[task] = None
 
         for task in self.rqdata.runq_setscene:
             for dep in self.rqdata.runq_depends[task]:
-                    if dep not in endpoints:
-                        endpoints[dep] = set()
-                    endpoints[dep].add(task)
+                    endpoints[dep] = task
 
         def process_endpoints(endpoints):
             newendpoints = {}
             for point, task in endpoints.items():
                 tasks = set()
                 if task:
-                    tasks |= task
+                    tasks.add(task)
                 if sq_revdeps_new[point]:
                     tasks |= sq_revdeps_new[point]
                 sq_revdeps_new[point] = set()
@@ -1459,28 +1448,6 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
             elif len(sq_revdeps_new[task]) != 0:
                 bb.msg.fatal("RunQueue", "Something went badly wrong during scenequeue generation, aborting. Please report this problem.")
 
-        # Resolve setscene inter-task dependencies
-        # e.g. do_sometask_setscene[depends] = "targetname:do_someothertask_setscene"
-        # Note that anything explicitly depended upon will have its reverse dependencies removed to avoid circular dependencies
-        for task in self.rqdata.runq_setscene:
-                realid = self.rqdata.taskData.gettask_id(self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[task]], self.rqdata.runq_task[task] + "_setscene", False)
-                idepends = self.rqdata.taskData.tasks_idepends[realid]
-                for (depid, idependtask) in idepends:
-                    if depid not in self.rqdata.taskData.build_targets:
-                        continue
-
-                    depdata = self.rqdata.taskData.build_targets[depid][0]
-                    if depdata is None:
-                         continue
-                    dep = self.rqdata.taskData.fn_index[depdata]
-                    taskid = self.rqdata.get_task_id(self.rqdata.taskData.getfn_id(dep), idependtask.replace("_setscene", ""))
-                    if taskid is None:
-                        bb.msg.fatal("RunQueue", "Task %s depends upon nonexistant task %s:%s" % (self.rqdata.taskData.tasks_name[realid], dep, idependtask))
-
-                    sq_revdeps_squash[self.rqdata.runq_setscene.index(task)].add(self.rqdata.runq_setscene.index(taskid))
-                    # Have to zero this to avoid circular dependencies
-                    sq_revdeps_squash[self.rqdata.runq_setscene.index(taskid)] = set()
-
         #for task in xrange(len(sq_revdeps_squash)):
         #    print "Task %s: %s.%s is %s " % (task, self.taskData.fn_index[self.runq_fnid[self.runq_setscene[task]]], self.runq_task[self.runq_setscene[task]] + "_setscene", sq_revdeps_squash[task])
 
@@ -1539,9 +1506,8 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
 
             for task in xrange(len(self.sq_revdeps)):
                 if task not in valid_new and task not in noexec:
-                    realtask = self.rqdata.runq_setscene[task]
                     logger.debug(2, 'No package found, so skipping setscene task %s',
-                                 self.rqdata.get_user_idstring(realtask))
+                                 self.rqdata.get_user_idstring(task))
                     self.task_failoutright(task)
 
         logger.info('Executing SetScene Tasks')
@@ -1614,7 +1580,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
             taskname = self.rqdata.runq_task[realtask] + "_setscene"
             if self.rq.check_stamp_task(realtask, self.rqdata.runq_task[realtask]):
                 logger.debug(2, 'Stamp for underlying task %s(%s) is current, so skipping setscene variant',
-                             task, self.rqdata.get_user_idstring(realtask))
+                             task, self.rqdata.get_user_idstring(task))
                 self.task_failoutright(task)
                 return True
 
@@ -1656,7 +1622,7 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
         for task in oldcovered:
             self.rq.scenequeue_covered.add(self.rqdata.runq_setscene[task])
 
-        logger.debug(1, 'We can skip tasks %s', sorted(self.rq.scenequeue_covered))
+        logger.debug(1, 'We can skip tasks %s', self.rq.scenequeue_covered)
 
         self.rq.state = runQueueRunInit
         return True

bitbake/lib/bb/siggen.py

@@ -72,10 +72,11 @@ class SignatureGeneratorBasic(SignatureGenerator):
 
     def _build_data(self, fn, d):
 
-        tasklist, gendeps, lookupcache = bb.data.generate_dependencies(d)
+        tasklist, gendeps = bb.data.generate_dependencies(d)
 
         taskdeps = {}
         basehash = {}
+        lookupcache = {}
 
         for task in tasklist:
             data = d.getVar(task, False)
@@ -100,7 +101,6 @@ class SignatureGeneratorBasic(SignatureGenerator):
             alldeps = seen - self.basewhitelist
 
             for dep in sorted(alldeps):
-                data = data + dep
                 if dep in lookupcache:
                     var = lookupcache[dep]
                 else:
@@ -135,7 +135,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
         k = fn + "." + task
         data = dataCache.basetaskhash[k]
         self.runtaskdeps[k] = []
-        for dep in sorted(deps, key=clean_basepath):
+        for dep in sorted(deps):
             # We only manipulate the dependencies for packages not in the whitelist
             if self.twl and not self.twl.search(dataCache.pkg_fn[fn]):
                 # then process the actual dependencies
@@ -159,7 +159,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
         k = fn + "." + task
         if runtime == "customfile":
             sigfile = stampbase
-        elif runtime and k in self.taskhash:
+        elif runtime:
             sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k]
         else:
             sigfile = stampbase + "." + task + ".sigbasedata" + "." + self.basehash[k]
@@ -180,7 +180,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
             data['gendeps'][dep] = self.gendeps[fn][dep]
             data['varvals'][dep] = self.lookupcache[fn][dep]
 
-        if runtime and k in self.taskhash:
+        if runtime:
             data['runtaskdeps'] = self.runtaskdeps[k]
             data['runtaskhashes'] = {}
             for dep in data['runtaskdeps']:
@@ -217,32 +217,19 @@ def dump_this_task(outfile, d):
     task = "do_" + d.getVar("BB_CURRENTTASK", True)
     bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile")
 
-def clean_basepath(a):
-    if a.startswith("virtual:"):
-        b = a.rsplit(":", 1)[0] + a.rsplit("/", 1)[1]
-    else:
-        b = a.rsplit("/", 1)[1]
-    return b
-
-def clean_basepaths(a):
-    b = {}
-    for x in a:
-        b[clean_basepath(x)] = a[x]
-    return b
-
 def compare_sigfiles(a, b):
     p1 = pickle.Unpickler(file(a, "rb"))
     a_data = p1.load()
     p2 = pickle.Unpickler(file(b, "rb"))
     b_data = p2.load()
 
-    def dict_diff(a, b, whitelist=set()):
+    def dict_diff(a, b):
         sa = set(a.keys())
         sb = set(b.keys())
         common = sa & sb
         changed = set()
         for i in common:
-            if a[i] != b[i] and i not in whitelist:
+            if a[i] != b[i]:
                 changed.add(i)
         added = sa - sb
         removed = sb - sa
@@ -250,23 +237,20 @@ def compare_sigfiles(a, b):
 
     if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']:
         print "basewhitelist changed from %s to %s" % (a_data['basewhitelist'], b_data['basewhitelist'])
-        print "changed items: %s" % a_data['basewhitelist'].symmetric_difference(b_data['basewhitelist'])
 
     if 'taskwhitelist' in a_data and a_data['taskwhitelist'] != b_data['taskwhitelist']:
         print "taskwhitelist changed from %s to %s" % (a_data['taskwhitelist'], b_data['taskwhitelist'])
-        print "changed items: %s" % a_data['taskwhitelist'].symmetric_difference(b_data['taskwhitelist'])
 
     if a_data['taskdeps'] != b_data['taskdeps']:
-        print "Task dependencies changed from:\n%s\nto:\n%s" % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps']))
+        print "Task dependencies changed from %s to %s" % (sorted(a_data['taskdeps']), sorted(b_data['taskdeps']))
 
     if a_data['basehash'] != b_data['basehash']:
         print "basehash changed from %s to %s" % (a_data['basehash'], b_data['basehash'])
 
-    changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'], a_data['basewhitelist'] & b_data['basewhitelist'])
+    changed, added, removed = dict_diff(a_data['gendeps'], b_data['gendeps'])
     if changed:
         for dep in changed:
             print "List of dependencies for variable %s changed from %s to %s" % (dep, a_data['gendeps'][dep], b_data['gendeps'][dep])
-            print "changed items: %s" % a_data['gendeps'][dep].symmetric_difference(b_data['gendeps'][dep])
     if added:
         for dep in added:
             print "Dependency on variable %s was added" % (dep)
@@ -281,9 +265,7 @@ def compare_sigfiles(a, b):
             print "Variable %s value changed from %s to %s" % (dep, a_data['varvals'][dep], b_data['varvals'][dep])
 
     if 'runtaskhashes' in a_data and 'runtaskhashes' in b_data:
-        a = clean_basepaths(a_data['runtaskhashes'])
-        b = clean_basepaths(b_data['runtaskhashes'])
-        changed, added, removed = dict_diff(a, b)
+        changed, added, removed = dict_diff(a_data['runtaskhashes'], b_data['runtaskhashes'])
         if added:
             for dep in added:
                 print "Dependency on task %s was added" % (dep)
@@ -292,10 +274,9 @@ def compare_sigfiles(a, b):
                 print "Dependency on task %s was removed" % (dep)
         if changed:
             for dep in changed:
-                print "Hash for dependent task %s changed from %s to %s" % (dep, a[dep], b[dep])
+                print "Hash for dependent task %s changed from %s to %s" % (dep, a_data['runtaskhashes'][dep], b_data['runtaskhashes'][dep])
     elif 'runtaskdeps' in a_data and 'runtaskdeps' in b_data and sorted(a_data['runtaskdeps']) != sorted(b_data['runtaskdeps']):
         print "Tasks this task depends on changed from %s to %s" % (sorted(a_data['runtaskdeps']), sorted(b_data['runtaskdeps']))
-        print "changed items: %s" % a_data['runtaskdeps'].symmetric_difference(b_data['runtaskdeps'])
 
 def dump_sigfile(a):
     p1 = pickle.Unpickler(file(a, "rb"))

bitbake/lib/bb/taskdata.py

@@ -175,7 +175,7 @@ class TaskData:
                 for dep in task_deps['depends'][task].split():
                     if dep:
                         if ":" not in dep:
-                            bb.msg.fatal("TaskData", "Error for %s, dependency %s does not contain ':' character\n. Task 'depends' should be specified in the form 'packagename:task'" % (fn, dep))
+                            bb.msg.fatal("TaskData", "Error, dependency %s does not contain ':' character\n. Task 'depends' should be specified in the form 'packagename:task'" % (dep, fn))
                         ids.append(((self.getbuild_id(dep.split(":")[0])), dep.split(":")[1]))
                 self.tasks_idepends[taskid].extend(ids)
 

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

@@ -71,7 +71,7 @@ class HobHandler(gobject.GObject):
         gobject.GObject.__init__(self)
 
         self.current_command = None
-        self.building = False
+        self.building = None
         self.build_toolchain = False
         self.build_toolchain_headers = False
         self.generating = False
@@ -79,17 +79,12 @@ class HobHandler(gobject.GObject):
         self.current_phase = None
         self.bbpath_ok = False
         self.bbfiles_ok = False
-        self.build_type = "image"
         self.image_dir = os.path.join(tempfile.gettempdir(), 'hob-images')
 
         self.model = taskmodel
         self.server = server
 
-        deploy_dir = self.server.runCommand(["getVariable", "DEPLOY_DIR"])
-        self.image_out_dir = os.path.join(deploy_dir, "images")
         self.image_output_types = self.server.runCommand(["getVariable", "IMAGE_FSTYPES"]).split(" ")
-        self.bbpath = self.server.runCommand(["getVariable", "BBPATH"])
-        self.bbfiles = self.server.runCommand(["getVariable", "BBFILES"])
 
     def run_next_command(self):
         if self.current_command and not self.generating:
@@ -133,10 +128,10 @@ class HobHandler(gobject.GObject):
             self.server.runCommand(["resetCooker"])
             self.server.runCommand(["reparseFiles"])
         elif self.current_command == self.BUILD_IMAGE:
+            self.building = "image"
             if self.generating:
                 self.emit("data-generated")
                 self.generating = False
-            self.building = True
             self.server.runCommand(["buildTargets", self.build_queue, "build"])
             self.build_queue = []
             self.current_command = None
@@ -252,12 +247,11 @@ class HobHandler(gobject.GObject):
         pmake = "-j %s" % threads
         self.server.runCommand(["setVariable", "BB_NUMBER_THREADS", pmake])
 
-    def build_targets(self, tgts, configurator, build_type="image"):
-        self.build_type = build_type
+    def build_image(self, image, configurator):
         targets = []
         nbbp = None
         nbbf = None
-        targets.extend(tgts)
+        targets.append(image)
         if self.build_toolchain and self.build_toolchain_headers:
             targets.append("meta-toolchain-sdk")
         elif self.build_toolchain:
@@ -265,7 +259,8 @@ class HobHandler(gobject.GObject):
         self.build_queue = targets
 
         if not self.bbpath_ok:
-            if self.image_dir in self.bbpath.split(":"):
+            bbpath = self.server.runCommand(["getVariable", "BBPATH"])
+            if self.image_dir in bbpath.split(":"):
                 self.bbpath_ok = True
             else:
                 nbbp = self.image_dir
@@ -273,8 +268,8 @@ class HobHandler(gobject.GObject):
         if not self.bbfiles_ok:
             import re
             pattern = "%s/\*.bb" % self.image_dir
-
-            for files in self.bbfiles.split(" "):
+            bbfiles = self.server.runCommand(["getVariable", "BBFILES"]).split(" ")
+            for files in bbfiles:
                 if re.match(pattern, files):
                     self.bbfiles_ok = True
 
@@ -289,6 +284,10 @@ class HobHandler(gobject.GObject):
         self.current_command = self.REPARSE_FILES
         self.run_next_command()
 
+    def build_packages(self, pkgs):
+        self.building = "packages"
+        self.server.runCommand(["buildTargets", pkgs, "build"])
+
     def cancel_build(self, force=False):
         if force:
             # Force the cooker to stop as quickly as possible
@@ -328,7 +327,7 @@ class HobHandler(gobject.GObject):
         return self.image_output_types
 
     def get_image_deploy_dir(self):
-        return self.image_out_dir
+        return self.server.runCommand(["getVariable", "DEPLOY_DIR_IMAGE"])
 
     def make_temp_dir(self):
         bb.utils.mkdirhier(self.image_dir)

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

@@ -39,7 +39,6 @@ class HobPrefs(gtk.Dialog):
             self.selected_image_types = handler.remove_image_output_type(ot)
 
         self.configurator.setConfVar('IMAGE_FSTYPES', "%s" % " ".join(self.selected_image_types).lstrip(" "))
-        self.reload_required = True
 
     def sdk_machine_combo_changed_cb(self, combo, handler):
         sdk_mach = combo.get_active_text()
@@ -332,4 +331,4 @@ class HobPrefs(gtk.Dialog):
         # headerscheck.set_active(self.build_toolchain_headers)
         # headerscheck.connect("toggled", self.toggle_headers_cb)
         # hbox.pack_start(headerscheck, expand=False, fill=False, padding=6)
-        self.connect("response", self.prefs_response_cb)
+        # self.connect("response", self.prefs_response_cb)

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

@@ -179,10 +179,6 @@ class RunningBuild (gobject.GObject):
             # that we need to attach to a task.
             self.tasks_to_iter[(package, task)] = i
 
-        # If we don't handle these the GUI does not proceed
-        elif isinstance(event, bb.build.TaskInvalid):
-            return
-
         elif isinstance(event, bb.build.TaskBase):
             current = self.tasks_to_iter[(package, task)]
             parent = self.tasks_to_iter[(package, None)]
@@ -246,14 +242,14 @@ class RunningBuild (gobject.GObject):
                                       Colors.OK,
                                       0))
 
+            # Emit a generic "build-complete" signal for things wishing to
+            # handle when the build is finished
+            self.emit("build-complete")
             # Emit the appropriate signal depending on the number of failures
             if (failures >= 1):
                 self.emit ("build-failed")
             else:
                 self.emit ("build-succeeded")
-            # Emit a generic "build-complete" signal for things wishing to
-            # handle when the build is finished
-            self.emit("build-complete")
 
         elif isinstance(event, bb.command.CommandFailed):
             if event.error.startswith("Exited with"):
@@ -329,7 +325,7 @@ class RunningBuildTreeView (gtk.TreeView):
                     menu = gtk.Menu()
                     menuitem = gtk.MenuItem("Copy")
                     menu.append(menuitem)
-                    menuitem.connect("activate", self.clipboard_handler, (model, it))
+                    menuitem.connect("activate", self.copy_handler, (model, it))
                     menuitem.show()
                     menuitem = gtk.MenuItem("Send log to pastebin")
                     menu.append(menuitem)

bitbake/lib/bb/ui/hob.py

@@ -304,11 +304,13 @@ class MainWindow (gtk.Window):
                 self.image_combo.disconnect(self.image_combo_id)
                 self.image_combo_id = None
             self.model.set_selected_image(self.selected_image)
+            self.selected_image = None
             if not self.image_combo_id:
                 self.image_combo_id = self.image_combo.connect("changed", self.image_changed_cb)
 
         if self.selected_packages:
             self.model.set_selected_packages(self.selected_packages)
+            self.selected_packages = None
 
     def reset_clicked_cb(self, button):
         lbl = "<b>Reset your selections?</b>\n\nAny new changes you have made will be lost"
@@ -320,7 +322,6 @@ class MainWindow (gtk.Window):
         if response == gtk.RESPONSE_OK:
             self.reset_build()
             self.search.set_text("")
-            self.selected_image = None
         return
 
     def reset_build(self):
@@ -396,13 +397,11 @@ class MainWindow (gtk.Window):
                                                  gtk.RESPONSE_OK))
         response  = chooser.run()
         rep = BuildRep(None, None, None)
-        recipe = chooser.get_filename()
         if response == gtk.RESPONSE_OK:
-            rep.loadRecipe(recipe)
-            self.save_path = recipe
-            self.model.load_image_rep(rep)
-            self.dirty = False
+            rep.loadRecipe(chooser.get_filename())
         chooser.destroy()
+        self.model.load_image_rep(rep)
+        self.dirty = False
 
     def bake_clicked_cb(self, button):
         build_image = True
@@ -460,9 +459,6 @@ class MainWindow (gtk.Window):
             image_name = recipepath.rstrip(".bb")
             path, sep, image_name = image_name.rpartition("/")
 
-            image = []
-            image.append(image_name)
-
             rep.writeRecipe(recipepath, self.model)
             # In the case where we saved the file for the purpose of building
             # it we should then delete it so that the users workspace doesn't
@@ -470,9 +466,9 @@ class MainWindow (gtk.Window):
             if not self.save_path:
                 self.files_to_clean.append(recipepath)
 
-            self.handler.build_targets(image, self.configurator)
+            self.handler.build_image(image_name, self.configurator)
         else:
-            self.handler.build_targets(self.model.get_selected_pn(), self.configurator, "packages")
+            self.handler.build_packages(self.model.get_selected_pn())
 
         # Disable parts of the menu which shouldn't be used whilst building
         self.set_menus_sensitive(False)
@@ -494,7 +490,7 @@ class MainWindow (gtk.Window):
 
     def build_complete_cb(self, running_build):
         # Have the handler process BB events again
-        self.handler.building = False
+        self.handler.building = None
         self.stopping = False
         self.back.connect("clicked", self.back_button_clicked_cb)
         self.back.set_sensitive(True)
@@ -508,7 +504,7 @@ class MainWindow (gtk.Window):
         self.files_to_clean = []
 
         lbl = "<b>Build completed</b>\n\nClick 'Edit Image' to start another build or 'View Messages' to view the messages output during the build."
-        if self.handler.build_type == "image" and self.build_succeeded:
+        if self.handler.building == "image" and self.build_succeeded:
             deploy = self.handler.get_image_deploy_dir()
             lbl = lbl + "\n<a href=\"file://%s\" title=\"%s\">Browse folder of built images</a>." % (deploy, deploy)
 

bitbake/lib/bb/utils.py

@@ -443,7 +443,7 @@ def lockfile(name, shared=False, retry=True):
                     return lf
             lf.close()
         except Exception:
-            pass
+            continue
         if not retry:
             return None
 
@@ -505,6 +505,7 @@ def preserved_envvars_exported():
         'SHELL',
         'TERM',
         'USER',
+        'USERNAME',
     ]
 
 def preserved_envvars_exported_interactive():

documentation/Makefile

@@ -1,61 +1,48 @@
 # 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.  Note that the figures for the Yocto Project Development Manual
-# differ between the 'master' and 'edison' branches.
+# 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.
+#    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
+#    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
-# DOC is used to indicate the folder name for a given manual. The variable
-# VER represents the distro version of the Yocto Release for which the manuals 
-# are being generated.  The variable BRANCH is used to indicate the 'edison'
-# branch and is used only when DOC=dev-manual (making the YP Development
-# Manual).  
-#
+# 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.
 # To build the HTML and PDF versions of the manual you must invoke the Makefile
 # with the DOC argument.  If you are going to publish the manual then you 
 # you must invoke the Makefile with both the DOC and the VER argument.
-# If you are building the 'edison' version of the YP DEvelopment Manual then
-# you must use the DOC and BRANCH arguments.  
 #
 # Examples:
 #
 #     make DOC=bsp-guide
 #     make DOC=yocto-project-qs
 #     make pdf DOC=poky-ref-manual
-#     make DOC=dev-manual BRANCH=edison
 #
 # The first example generates the HTML and PDF versions of the BSP Guide.
 # The second example generates the HTML version only of the Quick Start.  Note that 
 # the Quick Start only has an HTML version available.  The third example generates 
-# both the PDF and HTML versions of the Yocto Project Reference Manual. The 
-# last example generates both the PDF and HTML 'edison' versions of the YP 
-# Development Manual.
+# both the PDF and HTML versions of the Yocto Project Reference Manual.
 #
 # 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.2
-#    make publish DOC=adt-manual VER=1.2
-#    make publish DOC=dev-manual VER=1.1.1 BRANCH=edison
-#    make publish DOC=dev-manual VER=1.2 
+#    make publish DOC=bsp-guide VER=1.1
+#    make publish DOC=adt-manual VER=1.1
 #
-# The first example publishes the 1.2 version of both the PDF and HTML versions of 
-# the BSP Guide.  The second example publishes the 1.2 version of both the PDF and 
-# HTML versions of the ADT Manual. The third example publishes the PDF and HTML
-# 'edison' versions of the YP Development Manual.  Finally, the last example publishes
-# the PDF and HTML 'master' versions of the YP Development Manual. 
+# The first example publishes the 1.1 version of both the PDF and HTML versions of 
+# the BSP Guide.  The second example publishes the 1.1 version of both the PDF and 
+# HTML versions of the ADT Manual.
 #
 
 ifeq ($(DOC),bsp-guide)
@@ -79,32 +66,10 @@ XSLTOPTS = --stringparam html.stylesheet style.css \
            --stringparam  section.label.includes.component.label 1 \
            --xinclude
 ALLPREQ = html pdf tarball
-#
-# Note that the tarfile might produce the "Cannot stat: No such file or directory" error
-# message for .PNG files that are not present when building a particular branch.  The 
-# list of files is all-inclusive for all branches.
-#
-
-	ifeq ($(BRANCH),edison)
-TARFILES = style.css dev-manual.html dev-manual.pdf \
-           figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \
+TARFILES = style.css dev-manual.html dev-manual.pdf figures/bsp-dev-flow.png figures/dev-title.png \
            figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \
-           figures/kernel-example-repos-edison.png \
-           figures/kernel-overview-1.png figures/kernel-overview-2.png \
-           figures/kernel-overview-3-edison.png \
-           figures/source-repos.png figures/yp-download.png \
-           figures/wip.png
-	else
-TARFILES = style.css dev-manual.html dev-manual.pdf \
-           figures/app-dev-flow.png figures/bsp-dev-flow.png figures/dev-title.png \
-           figures/git-workflow.png figures/index-downloads.png figures/kernel-dev-flow.png \
-           figures/kernel-example-repos.png \
-           figures/kernel-overview-1.png figures/kernel-overview-2.png \
-           figures/kernel-overview-3.png \
-           figures/source-repos.png figures/yp-download.png \
-           figures/wip.png
-	endif
-
+           figures/kernel-example-repos.png figures/kernel-overview-1.png figures/kernel-overview-2.png \
+           figures/kernel-overview-3.png figures/source-repos.png figures/yp-download.png
 MANUALS = $(DOC)/$(DOC).html $(DOC)/$(DOC).pdf
 FIGURES = figures
 STYLESHEET = $(DOC)/*.css

documentation/adt-manual/adt-command.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='using-the-command-line'>
 <title>Using the Command Line</title>
@@ -13,9 +12,9 @@
         Toolchain Tarball)</link>".  
         And, that sourcing your architecture-specific environment setup script 
         initializes a suitable cross-toolchain development environment.  
-        During the setup, locations for the compiler, QEMU scripts, QEMU binary, 
+        This setup occurs by adding the compiler, QEMU scripts, QEMU binary, 
         a special version of <filename>pkgconfig</filename> and other useful 
-        utilities are added to the <filename>PATH</filename> variable.
+        utilities to the <filename>PATH</filename> variable.
         Variables to assist <filename>pkgconfig</filename> and <filename>autotools</filename> 
         are also defined so that, 
         for example, <filename>configure.sh</filename> can find pre-generated 
@@ -29,7 +28,7 @@
 <title>Autotools-Based Projects</title>
 
     <para>
-        For an Autotools-based project, you can use the cross-toolchain by just 
+        For an autotools-based project, you can use the cross-toolchain by just 
         passing the appropriate host option to <filename>configure.sh</filename>.
         The host option you use is derived from the name of the environment setup 
         script in <filename>/opt/poky</filename> resulting from unpacking the 
@@ -48,20 +47,6 @@
         This single command updates your project and rebuilds it using the appropriate 
         cross-toolchain tools.
     </para>
-    <note>
-        If <filename>configure</filename> script results in problems recognizing the 
-        <filename>--with-libtool-sysroot=&lt;sysroot-dir&gt;</filename> option, 
-        regenerate the script to enable the support by doing the following and then 
-        re-running the script:
-        <literallayout class='monospaced'>
-     $ libtoolize --automake
-     $ aclocal -I ${OECORE_NATIVE_SYSROOT}/usr/share/aclocal \
-        [-I &lt;dir_containing_your_project-specific_m4_macros&gt;]
-     $ autoconf
-     $ autoheader
-     $ automake -a
-        </literallayout>
-    </note>       
 </section>
 
 <section id='makefile-based-projects'>

documentation/adt-manual/adt-eclipse.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='adt-eclipse'>
 <title>Working Within Eclipse</title>
@@ -30,16 +29,12 @@
     <para>
         To develop within the Eclipse IDE, you need to do the following:
         <orderedlist>
-            <listitem><para>Install the optimal version of the Eclipse IDE.</para></listitem>
+            <listitem><para>Be sure the optimal version of the Eclipse IDE 
+                is installed.</para></listitem>
             <listitem><para>Configure the Eclipse IDE.</para></listitem>
             <listitem><para>Install the Eclipse Yocto Plug-in.</para></listitem>
             <listitem><para>Configure the Eclipse Yocto Plug-in.</para></listitem>
         </orderedlist>
-        <note>
-            Do not install Eclipse from your distribution's package repository.
-            Be sure to install Eclipse from the official Eclipse download site as directed
-            in the next section.
-        </note>
     </para>
 
     <section id='installing-eclipse-ide'>
@@ -49,7 +44,7 @@
             It is recommended that you have the Indigo 3.7 version of the 
             Eclipse IDE installed on your development system.  
             If you don’t have this version, you can find it at 
-            <ulink url='&ECLIPSE_MAIN_URL;'></ulink>.  
+            <ulink url='http://www.eclipse.org/downloads'></ulink>.  
             From that site, choose the Eclipse Classic version particular to your development
             host.  
             This version contains the Eclipse Platform, the Java Development 
@@ -59,12 +54,10 @@
         <para>
             Once you have downloaded the tarball, extract it into a clean 
             directory.
-            For example, the following commands unpack and install the Eclipse IDE
-            tarball found in the <filename>Downloads</filename> area 
-            into a clean directory using the default name <filename>eclipse</filename>:
+            For example, the following command unpacks and installs the Eclipse IDE
+            into a clean directory named <filename>eclipse</filename>:
             <literallayout class='monospaced'>
-     $ cd ~
-     $ tar -xzvf ~/Downloads/eclipse-SDK-3.7.1-linux-gtk-x86_64.tar.gz
+     $ tar -xzvf ~/Downloads/Eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz
             </literallayout>
         </para>
 
@@ -103,25 +96,21 @@
             Follow these general steps to configure Eclipse:
             <orderedlist>
                 <listitem><para>Start the Eclipse IDE.</para></listitem>
-                <listitem><para>Make sure you are in your Workbench and select 
-                    "Install New Software" from the "Help" pull-down menu.
+                <listitem><para>Select "Install New Software" from the "Help" pull-down menu.
                     </para></listitem>
-                <listitem><para>Select <filename>indigo - &ECLIPSE_INDIGO_URL;</filename>
+                <listitem><para>Select <filename>Indego - http://download.eclipse.org/releases/indego</filename>
                     from the "Work with:" pull-down menu.</para></listitem>
                 <listitem><para>Expand the box next to <filename>Programming Languages</filename>
                     and select the <filename>Autotools Support for CDT (incubation)</filename>
                     and <filename>C/C++ Development Tools</filename> boxes.</para></listitem>
-                <listitem><para>Expand the box next to "Linux Tools" and select the 
-                    "LTTng - Linux Tracing Toolkit(incubation)" boxes.</para></listitem>
                 <listitem><para>Complete the installation and restart the Eclipse IDE.</para></listitem>
-                <listitem><para>After the Eclipse IDE restarts and from the Workbench, select 
-                    "Install New Software" from the "Help" pull-down menu.</para></listitem>
-                <listitem><para>Click the 
+                <listitem><para>Select "Install New Software" from the "Help" pull-down menu.</para></listitem>
+                <listitem><para>After the Eclipse IDE restarts, click the 
                     "Available Software Sites" link.</para></listitem>
                 <listitem><para>Check the box next to 
-                    <filename>&ECLIPSE_UPDATES_URL;</filename>
+                    <filename>http://download.eclipse.org/tm/updates/3.3</filename>
                     and click "OK".</para></listitem>
-                <listitem><para>Select <filename>&ECLIPSE_UPDATES_URL;</filename>
+                <listitem><para>Select <filename>http://download.eclipse.org/tm/updates/3.3</filename>
                     from the "Work with:" pull-down menu.</para></listitem>
                 <listitem><para>Check the box next to <filename>TM and RSE Main Features</filename>.
                     </para></listitem>
@@ -129,13 +118,12 @@
                     and select every item except <filename>RSE Unit Tests</filename> and 
                     <filename>RSE WinCE Services (incubation)</filename>.</para></listitem>
                 <listitem><para>Complete the installation and restart the Eclipse IDE.</para></listitem>
-                <listitem><para>If necessary, select 
-                    "Install New Software" from the "Help" pull-down menu so you can click the 
-                    "Available Software Sites" link again.</para></listitem>
-                <listitem><para>After clicking "Available Software Sites", check the box next to 
-                    <filename>http://download.eclipse.org/tools/cdt/releases/indigo</filename>
+                <listitem><para>After the Eclipse IDE restarts, click the 
+                    "Available Software Sites" link.</para></listitem>
+                <listitem><para>Check the box next to 
+                    <filename>http://download.eclipse.org/tools/cdt/releases/indego</filename>
                     and click "OK".</para></listitem>
-                <listitem><para>Select <filename>&ECLIPSE_INDIGO_CDT_URL;</filename>
+                <listitem><para>Select <filename>http://download.eclipse.org/tools/cdt/releases/indego</filename>
                     from the "Work with:" pull-down menu.</para></listitem>
                 <listitem><para>Check the box next to <filename>CDT Main Features</filename>.
                     </para></listitem>
@@ -148,134 +136,39 @@
     </section>
 
     <section id='installing-the-eclipse-yocto-plug-in'>
-    <title>Installing or Accessing the Eclipse Yocto Plug-in</title>
+    <title>Installing the Eclipse Yocto Plug-in</title>
 
         <para>
-            You can install the Eclipse Yocto Plug-in into the Eclipse application
-            one of two ways:  using the Eclipse IDE and installing the plug-in as new software, or
-            using a built zip file.
-            If you don't want to permanently install the plug-in but just want to try it out
-            within the Eclipse environment, you can import the plug-in project from the 
-            Yocto Project source repositories.
+            To install the Eclipse Yocto Plug-in, follow these special steps.  
+            The steps are WIP and are not final. 
+            Once they are final they will be replaced with the actual steps:
+            <orderedlist>
+                <listitem><para>Open a shell and create a Git repository with:
+                    <literallayout class='monospaced'>
+     $ git clone git://git.yoctoproject.org/yocto-eclipse yocto-eclipse
+                    </literallayout></para></listitem>
+                <listitem><para>In Eclipse, select "Import" from the "File" menu.</para></listitem>
+                <listitem><para>Expand the "General" box and pick "existing projects into workspace".
+                    </para></listitem>
+                <listitem><para>Select the root directory and browse to "~/yocto-eclipse/plugins".
+                    </para></listitem>
+                <listitem><para>There will be three things there.
+                    Select each one and install one at a time.
+                    Do all three.</para></listitem>
+                <listitem><para>Restart everything.</para></listitem>
+            </orderedlist>
         </para>
 
-        <section id='new-software'>
-        <title>Installing the Plug-in as New Software</title>
-
-            <para>
-                To install the Eclipse Yocto Plug-in as new software directly into the Eclipse IDE, 
-                follow these steps:
-                <orderedlist>
-                    <listitem><para>Start up the Eclipse IDE.</para></listitem>
-                    <listitem><para>In Eclipse, select "Install New Software" from the "Help" menu.</para></listitem>
-                    <listitem><para>Click "Add..." in the "Work with:" area.</para></listitem>
-                    <listitem><para>Enter 
-                        <filename>&ECLIPSE_DL_PLUGIN_URL;</filename> 
-                        in the URL field and provide a meaningful name in the "Name" field.</para></listitem>
-                    <listitem><para>Click "OK" to have the entry added to the "Work with:" 
-                        drop-down list.</para></listitem>
-                    <listitem><para>Select the entry for the plug-in from the "Work with:" drop-down 
-                        list.</para></listitem>
-                    <listitem><para>Check the box next to <filename>Development tools and SDKs for Yocto Linux</filename>.
-                        </para></listitem>
-                    <listitem><para>Complete the remaining software installation steps and 
-                        then restart the Eclipse IDE to finish the installation of the plug-in.
-                        </para></listitem>
-                </orderedlist>
-            </para>
-        </section>
-
-       <section id='zip-file-method'>
-       <title>Installing the Plug-in from a Zip File</title>
-            <para>
-                To install the Eclipse Yocto Plug-in by building and installing a plug-in 
-                zip file, follow these steps:
-                <orderedlist>
-                    <listitem><para>Open a shell and create a Git repository with:
-                        <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/eclipse-poky yocto-eclipse
-                        </literallayout>
-                        For this example, the repository is named     
-                        <filename>~/yocto-eclipse</filename>.</para></listitem>
-                    <listitem><para>Locate the <filename>build.sh</filename> script in the 
-                        Git repository you created in the previous step.
-                        The script is located in the <filename>scripts</filename>.</para></listitem>
-                    <listitem><para>Be sure to set and export the <filename>ECLIPSE_HOME</filename> environment
-                        variable to the top-level directory in which you installed the Indigo  
-                        version of Eclipse.
-                        For example, if your Eclipse directory is <filename>$HOME/eclipse</filename>, 
-                        use the following:
-                        <literallayout class='monospaced'>
-     $ export ECLIPSE_HOME=$HOME/eclipse
-                        </literallayout></para></listitem>
-                    <listitem><para>Run the <filename>build.sh</filename> script and provide the 
-                        name of the Git branch along with the Yocto Project release you are 
-                        using.
-                        Here is an example that uses the <filename>master</filename> Git repository
-                        and the <filename>&DISTRO;</filename> release:
-                        <literallayout class='monospaced'>
-     $ scripts/build.sh master &DISTRO; 
-                        </literallayout>
-                        After running the script, the file
-                        <filename>org.yocto.sdk-&lt;release&gt;-&lt;date&gt;-archive.zip</filename>
-                        is in the current directory.</para></listitem>
-                    <listitem><para>If necessary, start the Eclipse IDE and be sure you are in the 
-                        Workbench.</para></listitem>
-                    <listitem><para>Select "Install New Software" from the "Help" pull-down menu.
-                        </para></listitem>
-                    <listitem><para>Click "Add".</para></listitem>
-                    <listitem><para>Provide anything you want in the "Name" field.</para></listitem>
-                    <listitem><para>Click "Archive" and browse to the ZIP file you built 
-                        in step four.  
-                        This ZIP file should not be "unzipped", and must be the 
-                        <filename>*archive.zip</filename> file created by running the 
-                        <filename>build.sh</filename> script.</para></listitem>
-                    <listitem><para>Check the box next to the new entry in the installation window and complete
-                        the installation.</para></listitem>
-                    <listitem><para>Restart the Eclipse IDE if necessary.</para></listitem>
-                </orderedlist>
-            </para>
-
-            <para>
-                At this point you should be able to configure the Eclipse Yocto Plug-in as described in the
-                "<link linkend='configuring-the-eclipse-yocto-plug-in'>Configuring the Eclipse Yocto Plug-in</link>"
-                section.</para>
-        </section>            
-
-        <section id='yocto-project-source'>
-        <title>Importing the Plug-in Project into the Eclipse Environment</title>
-            <para>
-                Importing the Eclipse Yocto Plug-in project from the Yocto Project source repositories
-                is useful when you want to try out the latest plug-in from the tip of plug-in's 
-                development tree.
-                It is important to understand when you import the plug-in you are not installing 
-                it into the Eclipse application.
-                Rather, you are importing the project and just using it.
-                To import the plug-in project, follow these steps:
-                <orderedlist>
-                    <listitem><para>Open a shell and create a Git repository with:
-                        <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/eclipse-poky yocto-eclipse
-                        </literallayout>
-                        For this example, the repository is named 
-                        <filename>~/yocto-eclipse</filename>.</para></listitem>
-                    <listitem><para>In Eclipse, select "Import" from the "File" menu.</para></listitem>
-                    <listitem><para>Expand the "General" box and select "existing projects into workspace"
-                        and then click "Next".</para></listitem>
-                    <listitem><para>Select the root directory and browse to "~/yocto-eclipse/plugins".
-                        </para></listitem>
-                    <listitem><para>There will be three things there.
-                        Select each one and install one at a time.
-                        Do all three.</para></listitem>
-                </orderedlist>
-            </para>
-
-            <para>
-                The left navigation pane in the Eclipse application shows the default projects. 
-                Right-click on one of these projects and run it as an Eclipse application.
-                This brings up a second instance of Eclipse IDE that has the Yocto Plug-in.
-           </para>
-       </section>
+        <para>
+            At this point I should be able to invoke Eclipse from the shell using the following:
+                    <literallayout class='monospaced'>
+     $ cd ~/eclipse
+     $ ./eclipse -vmargs -XX:PermSize=256M
+                    </literallayout>
+            What is shown is the default projects in the left pane. 
+            I should be able to right-click on one of these and run as an Eclipse application to 
+           bring up the Eclipse instance again with the Eclipse Yocto Plug-in working.
+       </para>            
     </section>
 
     <section id='configuring-the-eclipse-yocto-plug-in'>
@@ -293,7 +186,7 @@
             To start, you need to do the following from within the Eclipse IDE:
             <itemizedlist>
                 <listitem><para>Choose <filename>Windows -&gt; Preferences</filename> to display 
-                    the <filename>Preferences</filename> Dialog</para></listitem>
+                    the Preferences Dialog</para></listitem>
                 <listitem><para>Click <filename>Yocto ADT</filename></para></listitem>
             </itemizedlist>
         </para>
@@ -330,12 +223,12 @@
                         </para></listitem>
                     <listitem><para><emphasis>Point to the Toolchain:</emphasis>
                         If you are using a stand-alone pre-built toolchain, you should be pointing to the
-                        <filename>&YOCTO_ADTPATH_DIR;</filename> directory.
+                        <filename>/opt/poky/$SDKVERSION</filename> directory.
                         This is the location for toolchains installed by the ADT Installer or by hand.
-                        Sections "<link linkend='configuring-and-running-the-adt-installer-script'>Configuring 
-                        and Running the ADT Installer Script</link>" and 
-                        "<link linkend='using-an-existing-toolchain-tarball'>Using a Cross-Toolchain 
-                        Tarball</link>" describe two ways to install
+                        Sections <link linkend='configuring-and-running-the-adt-installer-script'>
+                        Configuring and Running the ADT Installer Script</link> and 
+                        <link linkend='using-an-existing-toolchain-tarball'>
+                        Using a Cross-Toolchain Tarball</link> describe two ways to install
                         a stand-alone cross-toolchain in the 
                         <filename>/opt/poky</filename> directory.
                         <note>It is possible to install a stand-alone cross-toolchain in a directory
@@ -344,8 +237,8 @@
                         <para>If you are using a system-derived toolchain, the path you provide 
                         for the <filename>Toolchain Root Location</filename>
                         field is the Yocto Project's build directory.
-                        See section "<link linkend='using-the-toolchain-from-within-the-build-tree'>Using 
-                        BitBake and the Yocto Project Build Tree</link>" for 
+                        See section <link linkend='using-the-toolchain-from-within-the-build-tree'>
+                        Using BitBake and the Yocto Project Build Tree</link> for 
                         information on how to install the toolchain into the Yocto 
                         Project build tree.</para></listitem> 
                     <listitem><para><emphasis>Specify the Sysroot Location:</emphasis>
@@ -362,8 +255,10 @@
                         The pull-down menu should have the supported architectures.  
                         If the architecture you need is not listed in the menu, you 
                         will need to build the image.
-                        See the "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>" section 
-                        of The Yocto Project Quick Start for more information.</para></listitem>
+                        See the 
+                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'> Building an Image</ulink> section of the  
+                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+                        The Yocto Project Quick Start</ulink> for more information.</para></listitem>
                 </itemizedlist>
             </para>
         </section>
@@ -455,33 +350,28 @@
 <title>Configuring the Cross-Toolchains</title>
 
     <para>
-        The earlier section, "<link linkend='configuring-the-eclipse-yocto-plug-in'>Configuring 
-        the Eclipse Yocto Plug-in</link>", sets up the default project 
+        The previous section, "<link linkend='configuring-the-eclipse-yocto-plug-in'>
+        Configuring the Eclipse Yocto Plug-in</link>", set up the default project 
         configurations.  
-        You can override these settings for a given project by following these steps:
+        You can change these settings for a given project by following these steps:
         <orderedlist>
-            <listitem><para>Select <filename>Project -&gt; Change Yocto Project Settings</filename>:  
-                This selection brings up the <filename>Project Yocto Settings</filename> Dialog
-                and allows you to make changes specific to an individual project.  
-                </para>
-                <para>By default, the Cross Compiler Options and Target Options for a project
-                are inherited from settings you provide using the <filename>Preferences</filename>
-                Dialog as described earlier 
-                in the "<link linkend='configuring-the-eclipse-yocto-plug-in'>Configuring the Eclipse 
-                Yocto Plug-in</link>" section.
-                The <filename>Project Yocto Settings</filename>
-                Dialog allows you to override those default settings
-                for a given project.</para></listitem>
-            <listitem><para>Make your configurations for the project and click "OK".</para></listitem>
+            <listitem><para>Select <filename>Window -&gt; Preferences</filename>:  
+                This selection brings up the <filename>Preferences</filename> Dialog.  
+                If the Yocto ADT Preferences are not automatically displayed, you can navigate to 
+                that dialog by selection <filename>Yocto ADT</filename> in the left-hand 
+                panel.</para>
+                <para>Yocto ADT Settings are inherited from the default project configuration.  
+                The information in this dialog is identical to that chosen earlier 
+                for the Cross Compiler Options and Target Options as described in 
+                <link linkend='configuring-the-eclipse-yocto-plug-in'>
+                Configuring the Eclipse Yocto Plug-in</link> section.</para></listitem>
             <listitem><para>Select <filename>Project -&gt; Reconfigure Project</filename>:   
                 This selection reconfigures the project by running
                 <filename>autogen.sh</filename> in the workspace for your project.  
                 The script also runs <filename>libtoolize</filename>, <filename>aclocal</filename>,
                 <filename>autoconf</filename>, <filename>autoheader</filename>, 
                 <filename>automake --a</filename>, and 
-                <filename>./configure</filename>.
-                Click on the <filename>Console</filename> tab beneath your source code to 
-                see the results of reconfiguring your project.</para></listitem>
+                <filename>./configure</filename>.</para></listitem>
         </orderedlist>
     </para>
 </section>
@@ -501,20 +391,20 @@
     <para>
         To start the QEMU emulator from within Eclipse, follow these steps:
         <orderedlist>
-            <listitem><para>Expose the <filename>Run -&gt; External Tools</filename> menu.
+            <listitem><para>Expose the <filename>Run -&gt; External Tools -&gt; External Tools 
+                Configurations...</filename> menu.
                 Your image should appear as a selectable menu item.
                 </para></listitem>
-            <listitem><para>Select your image from the menu to launch the 
-                emulator in a new window.</para></listitem>
-            <listitem><para>If needed, enter your host root password in the shell window at the prompt.  
+            <listitem><para>Select your image from the menu.
+                Doing so launches a new window.</para></listitem>
+            <listitem><para>Enter your host root password in the shell window at the prompt.  
                 This sets up a <filename>Tap 0</filename> connection needed for running in user-space 
                 NFS mode.</para></listitem>
             <listitem><para>Wait for QEMU to launch.</para></listitem>
-            <listitem><para>Once QEMU launches, you can begin operating within that 
-                environment.
-                For example, you could determine the IP Address 
-                for the user-space NFS by using the <filename>ifconfig</filename> command.
-                </para></listitem>
+            <listitem><para>Once QEMU launches you need to determine the IP Address 
+                for the user-space NFS.  
+                You can do that by going to a terminal in the QEMU and entering the 
+            <filename>ifconfig</filename> command.</para></listitem>
         </orderedlist>
     </para>
 </section>
@@ -523,8 +413,8 @@
 <title>Deploying and Debugging the Application</title>
 
     <para>
-        Once the QEMU emulator is running the image, using the Eclipse IDE 
-        you can deploy your application and use the emulator to perform debugging.  
+        Once the QEMU emulator is running the image, you can deploy your application and use the emulator 
+        to perform debugging.  
         Follow these steps to deploy the application.
         <orderedlist>
             <listitem><para>Select <filename>Run -&gt; Debug Configurations...</filename></para></listitem>
@@ -545,8 +435,8 @@
             <listitem><para>Click <filename>Next</filename>.</para></listitem>
             <listitem><para>Clear out the <filename>host name</filename> field and enter the IP Address 
                 determined earlier.</para></listitem>
-            <listitem><para>Click <filename>Finish</filename> to close the 
-                <filename>New Connections</filename> Dialog.</para></listitem>
+            <listitem><para>Click <filename>Finish</filename> to close the new connections 
+                Dialog.</para></listitem>
             <listitem><para>Use the drop-down menu now in the <filename>Connection</filename> field and pick 
                 the IP Address you entered.</para></listitem>
             <listitem><para>Click <filename>Debug</filename> to bring up a login screen 
@@ -564,7 +454,7 @@
         your development experience.  
         These tools are aids in developing and debugging applications and images.  
         You can run these user-space tools from within the Eclipse IDE through the 
-        <filename>YoctoTools</filename> menu.
+        <filename>Window -&gt; YoctoTools</filename> menu.
     </para>
 
     <para>
@@ -589,14 +479,14 @@
                 host can use, you must have <filename>oprofile</filename> version 0.9.4 or 
                 greater installed on the host.</para>
                 <para>You can locate both the viewer and server from 
-                <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/oprofileui/'></ulink>.
+                <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/oprofileui/'></ulink>.
                 <note>The <filename>oprofile-server</filename> is installed by default on 
                 the <filename>core-image-sato-sdk</filename> image.</note></para></listitem>
-            <listitem><para><emphasis><filename>Lttng-ust</filename>:</emphasis> Selecting this tool runs
-                <filename>usttrace</filename> on the remote target, transfers the output data back 
-                to the local host machine, and uses the <filename>lttng</filename> Eclipse plug-in to 
-                graphically display the output. 
-                For information on how to use <filename>lttng</filename> to trace an application, see
+            <listitem><para><emphasis><filename>Lttng-ust</filename>:</emphasis> Selecting this tool runs 
+                <filename>usttrace</filename> on the remote target, transfers the output data back to the 
+                local host machine, and uses <filename>lttv-gui</filename> to graphically display the output.  
+                The <filename>lttv-gui</filename> must be installed on the local host machine to use this tool.  
+                For information on how to use <filename>lttng</filename> to trace an application, see 
                 <ulink url='http://lttng.org/files/ust/manual/ust.html'></ulink>.</para>
                 <para>For <filename>Application</filename>, you must supply the absolute path name of the 
                 application to be traced by user mode <filename>lttng</filename>.  
@@ -604,32 +494,7 @@
                 <filename>usttrace /path/to/foo</filename> on the remote target to trace the 
                 program <filename>/path/to/foo</filename>.</para>
                 <para><filename>Argument</filename> is passed to <filename>usttrace</filename>
-                running on the remote target.</para>
-                <para>Before you use the <filename>lttng-ust</filename> tool, you need to setup 
-                the <filename>lttng</filename> Eclipse plug-in and create a <filename>lttng</filename>
-                project.
-                Do the following:
-                <orderedlist>
-                    <listitem><para>Follow these 
-                        <ulink url='http://wiki.eclipse.org/Linux_Tools_Project/LTTng#Downloading_and_installing_the_LTTng_parser_library'>instructions</ulink>
-                        to download and install the <filename>lttng</filename> parser library.
-                        </para></listitem>
-                    <listitem><para>Select <filename>Window -> Open Perspective -> Other</filename>
-                        and then select <filename>LTTng</filename>.</para></listitem>
-                    <listitem><para>Click <filename>OK</filename> to change the Eclipse perspective 
-                        into the <filename>LTTng</filename> perspective.</para></listitem>
-                    <listitem><para>Create a new <filename>LTTng</filename> project by selecting 
-                        <filename>File -> New -> Project</filename>.</para></listitem>
-                    <listitem><para>Choose <filename>LTTng -> LTTng Project</filename>.</para></listitem>
-                    <listitem><para>Click <filename>YoctoTools -> lttng-ust</filename> to start user mode 
-                        <filename>lttng</filename> on the remote target.</para></listitem>
-                </orderedlist></para>
-                <para>After the output data has been transferred from the remote target back to the local
-                host machine, new traces will be imported into the selected <filename>LTTng</filename> project.
-                Then you can go to the <filename>LTTng</filename> project, right click the imported 
-                trace, and set the trace type as the <filename>LTTng</filename> kernel trace.
-                Finally, right click the imported trace and select <filename>Open</filename>
-                to display the data graphically.</para></listitem>
+                running on the remote target.</para></listitem>
             <listitem><para><emphasis><filename>PowerTOP</filename>:</emphasis> Selecting this tool runs 
                 <filename>powertop</filename> on the remote target machine and displays the results in a 
                 new view called <filename>powertop</filename>.</para>

documentation/adt-manual/adt-intro.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='adt-intro'>
 
@@ -107,7 +106,7 @@
                 <listitem><para><emphasis>PowerTOP:</emphasis> Helps you determine what   
                     software is using the most power.  
                     You can find out more about PowerTOP at 
-                    <ulink url='https://01.org/powertop/'></ulink>.</para></listitem>
+                    <ulink url='http://www.linuxpowertop.org/'></ulink>.</para></listitem>
                 <listitem><para><emphasis>OProfile:</emphasis> A system-wide profiler for Linux 
                     systems that is capable of profiling all running code at low overhead.  
                     You can find out more about OProfile at 
@@ -115,7 +114,7 @@
                 <listitem><para><emphasis>Perf:</emphasis> Performance counters for Linux used 
                     to keep track of certain types of hardware and software events.  
                     For more information on these types of counters see 
-                    <ulink url='https://perf.wiki.kernel.org/'></ulink> and click 
+                    <ulink url='https://perf.wiki.kernel.org/index.php'></ulink> and click 
                     on “Perf tools.”</para></listitem>
                 <listitem><para><emphasis>SystemTap:</emphasis> A free software infrastructure 
                     that simplifies information gathering about a running Linux system.  

documentation/adt-manual/adt-manual.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <book id='adt-manual' lang='en' 
       xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -32,32 +31,17 @@
             <revision>
                 <revnumber>1.0</revnumber>
                 <date>6 April 2011</date>
-                <revremark>Released with the Yocto Project 1.0 Release.</revremark>
+                <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 the Yocto Project 1.0.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1</revnumber>
-                <date>6 October 2011</date>
-                <revremark>Released with the Yocto Project 1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.1</revnumber>
-                <date>15 March 2012</date>
-                <revremark>Released with the Yocto Project 1.1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.2</revnumber>
-                <date>July 2012</date>
-                <revremark>Released with the Yocto Project 1.1.2 Release.</revremark>
+                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
             </revision>
         </revhistory>
 
     <copyright>
-      <year>&COPYRIGHT_YEAR;</year>
+      <year>2010-2011</year>
       <holder>Linux Foundation</holder>
     </copyright>
 
@@ -69,9 +53,9 @@
       <note>
           Due to production processes, there could be differences between the Yocto Project
           documentation bundled in the release tarball and the 
-          <ulink url='&YOCTO_DOCS_ADT_URL;'>
+          <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>
           Application Developer's Toolkit (ADT) User's Guide</ulink> on
-          the <ulink url='&YOCTO_HOME_URL;'>Yocto Project</ulink> website.
+          the <ulink url='http://www.yoctoproject.org'>Yocto Project</ulink> website.
           For the latest version of this manual, see the manual on the website.
       </note>
 

documentation/adt-manual/adt-package.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='adt-package'>
 <title>Optionally Customizing the Development Packages Installation</title>
@@ -55,7 +54,9 @@
 
     <note>
         For build performance information related to the PMS, see
-        <ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-package'>Packaging - <filename>package*.bbclass</filename></ulink> in The Yocto Project Reference Manual.
+        <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-classes-package'>Packaging - <filename>package*.bbclass</filename></ulink> 
+        in <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+        The Yocto Project Reference Manual</ulink>.
     </note>
 
     <para>

documentation/adt-manual/adt-prepare.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='adt-prepare'>
 
@@ -10,9 +9,60 @@
     In order to use the ADT, you must install it, <filename>source</filename> a script to set up the 
     environment, and be sure both the kernel and filesystem image specific to the target architecture 
     exist. 
-    This chapter describes how to be sure you meet the ADT requirements.
 </para>
 
+<para> 
+    This chapter describes two important terms and how to be sure you meet the ADT requirements.
+</para>
+
+<section id='yocto-project-files'>
+    <title>Yocto Project Files and Build Areas</title>
+
+    <para>
+        Before learning how to prepare your system for the ADT, you need to understand
+        two important terms used throughout this manual:
+        <itemizedlist>
+            <listitem><para><emphasis>The Yocto Project Files:</emphasis>
+                This term refers to the directory structure created as a result of downloading 
+                and unpacking a Yocto Project release tarball or setting up a Git repository
+                by cloning <filename>git://git.yoctoproject.org/poky</filename>.</para>
+                <para>The Yocto Project files contain BitBake, Documentation, metadata and 
+                other files that all support the development environment. 
+                Consequently, you must have the Yocto Project files in place on your development 
+                system in order to do any development using the Yocto Project.</para>
+                <para>The name of the top-level directory of the Yocto Project file structure  
+                is derived from the Yocto Project release tarball.
+                For example, downloading and unpacking <filename>poky-edison-6.0.tar.bz2</filename>
+                results in a Yocto Project source tree whose Yocto Project source directory is named 
+                <filename>poky-edison-6.0</filename>.
+                If you create a Git repository, then you can name the repository anything you like.</para>
+                <para>You can find instruction on how to set up the Yocto Project files on your 
+                host development system by reading the 
+                <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#getting-setup'>
+                Getting Setup</ulink> section in
+                <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
+                The Yocto Project Development Manual</ulink>.</para></listitem>
+            <listitem><para><emphasis>Yocto Project Build Tree:</emphasis>
+                This term refers to the area where the Yocto Project builds images.  
+                The area is created when you <filename>source</filename> the Yocto Project setup 
+                environment script that is found in the Yocto Project files area. 
+                (e.g. <filename>oe-init-build-env</filename>).
+                You can create the Yocto Project build tree anywhere you want on your 
+                development system.
+                Here is an example that creates the tree in <filename>mybuilds</filename> 
+                and names the Yocto Project build directory <filename>YP-6.0</filename>:
+                <literallayout class='monospaced'> 
+     $ source poky-edison-6.0/oe-init-build-env $HOME/mybuilds/YP-6.0
+                </literallayout>
+                If you don't specifically name the build directory, then BitBake creates it 
+                in the current directory and uses the name <filename>build</filename>.
+                Also, if you supply an existing directory, then BitBake uses that 
+                directory as the Yocto Project build directory and populates the build tree
+                beneath it.</para></listitem>
+        </itemizedlist>
+    </para>
+</section>
+
 <section id='installing-the-adt'>
     <title>Installing the ADT</title>
 
@@ -20,8 +70,7 @@
         The following list describes how you can install the ADT, which includes the cross-toolchain.
         Regardless of the installation you choose, you must <filename>source</filename> the cross-toolchain
         environment setup script before you use the toolchain.
-        See the "<link linkend='setting-up-the-cross-development-environment'>Setting Up the 
-        Cross-Development Environment</link>"
+        See the "<link linkend='setting-up-the-environment'>Setting Up the Environment</link>"
         section for more information.
         <itemizedlist>
             <listitem><para><emphasis>Use the ADT Installer Script:</emphasis>
@@ -36,8 +85,8 @@
                 If you use this method, you just get the cross-toolchain and QEMU - you do not 
                 get any of the other mentioned benefits had you run the ADT Installer script.</para></listitem>
             <listitem><para><emphasis>Use the Toolchain from within a Yocto Project Build Tree:</emphasis>
-                If you already have a Yocto Project build tree, you can build the cross-toolchain 
-                within tree.
+                If you already have a Yocto Project build tree, you can install the cross-toolchain 
+                using that tree.
                 However, like the previous method mentioned, you only get the cross-toolchain and QEMU - you 
                 do not get any of the other benefits without taking separate steps.</para></listitem>
         </itemizedlist>
@@ -56,18 +105,15 @@
 
             <para>
                 The ADT Installer is contained in the ADT Installer tarball.
-                You can download the tarball into any directory from the 
-                <ulink url='&YOCTO_DL_URL;/releases'>Index of Releases</ulink>, specifically
-                at  
-                <ulink url='&YOCTO_ADTINSTALLER_DL_URL;'></ulink>.
+                You can download the tarball into any directory from  
+                <ulink url='http://autobuilder.yoctoproject.org/downloads/yocto-1.1/adt-installer/'></ulink>.
                 Or, you can use BitBake to generate the tarball inside the existing Yocto Project 
                 build tree.
             </para>
 
             <para>
                 If you use BitBake to generate the ADT Installer tarball, you must 
-                <filename>source</filename> the Yocto Project environment setup script 
-                (<filename>oe-init-build-env</filename>) located 
+                <filename>source</filename> the Yocto Project environment setup script located 
                 in the Yocto Project file structure before running the <filename>bitbake</filename>
                 command that creates the tarball.
             </para>
@@ -82,9 +128,9 @@
      $ cd ~
      $ mkdir yocto-project
      $ cd yocto-project
-     $ wget &YOCTO_RELEASE_DL_URL;/&YOCTO_POKY_TARBALL;
-     $ tar xjf &YOCTO_POKY_TARBALL;
-     $ source &OE_INIT_PATH;
+     $ wget http://www.yoctoproject.org/downloads/poky/poky-edison-6.0.tar.bz2
+     $ tar xjf poky-edison-6.0.tar.bz2
+     $ source poky-edison-6.0/oe-init-build-env
      $ bitbake adt-installer
                 </literallayout>
             </para>
@@ -96,14 +142,6 @@
             <para>
                 Before running the ADT Installer script, you need to unpack the tarball.
                 You can unpack the tarball in any directory you wish.
-                For example, this command copies the ADT Installer tarball from where 
-                it was built into the home directory and then unpacks the tarball into 
-                a top-level directory named <filename>adt-installer</filename>:
-                <literallayout class='monospaced'>
-     $ cd ~
-     $ cp ~/poky/build/tmp/deploy/sdk/adt_installer.tar.bz2 $HOME
-     $ tar -xjf adt_installer.tar.bz2
-                </literallayout>
                 Unpacking it creates the directory <filename>adt-installer</filename>, 
                 which contains the ADT Installer script (<filename>adt_installer</filename>)
                 and its configuration file (<filename>adt_installer.conf</filename>).
@@ -166,20 +204,19 @@
 
             <para>
                 After you have configured the <filename>adt_installer.conf</filename> file, 
-                run the installer using the following command.
-                Be sure that you are not trying to use cross-compilation tools. 
-                When you run the installer, the environment must use a 
-                host <filename>gcc</filename>:
+                run the installer using the following command:
                 <literallayout class='monospaced'>
-     $ ./adt_installer
+     $ adt_installer
                 </literallayout>
             </para>
 
             <note>
                 The ADT Installer requires the <filename>libtool</filename> package to complete.  
-                If you install the recommended packages as described in  
-                "<ulink url='&YOCTO_DOCS_QS_URL;#packages'>The Packages</ulink>"
-                section of The Yocto Project Quick Start, then you will have libtool installed.
+                If you install the recommended packages as described in the 
+                <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>
+                Packages</ulink> section of 
+                <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+                The Yocto Project Quick Start</ulink>, then you will have libtool installed.
             </note>
 
             <para>
@@ -193,7 +230,7 @@
             <para>
                 Once the installation completes, the ADT, which includes the cross-toolchain, is installed.
                 You will notice environment setup files for the cross-toolchain in 
-                <filename>&YOCTO_ADTPATH_DIR;</filename>,
+                <filename>/opt/poky/$SDKVERSION</filename>,
                 and image tarballs in the <filename>adt-installer</filename>
                 directory according to your installer configurations, and the target sysroot located
                 according to the <filename>YOCTOADT_TARGET_SYSROOT_LOC_&lt;arch&gt;</filename> variable
@@ -208,70 +245,64 @@
         <para>
             If you want to simply install the cross-toolchain by hand, you can do so by using an existing 
             cross-toolchain tarball.  
-            If you use this method to install the cross-toolchain and you still need to install the target 
-            sysroot, you will have to install sysroot separately.
+            If you install the cross-toolchain by hand, you will have to set up the target sysroot separately.
         </para>
 
         <para>
             Follow these steps:
             <orderedlist>
                 <listitem><para>Go to  
-                    <ulink url='&YOCTO_TOOLCHAIN_DL_URL;'></ulink> 
+                    <ulink url='http://autobuilder.yoctoproject.org/downloads/yocto-1.1/toolchain'></ulink> 
                     and find the folder that matches your host development system 
                     (i.e. <filename>i686</filename> for 32-bit machines or 
-                    <filename>x86-64</filename> for 64-bit machines).</para></listitem>
+                    <filename>x86_64</filename> for 64-bit machines).</para></listitem>
                 <listitem><para>Go into that folder and download the toolchain tarball whose name 
                     includes the appropriate target architecture.
                     For example, if your host development system is an Intel-based 64-bit system and 
-                    you are going to use your cross-toolchain for an Intel-based 32-bit target, go into the 
+                    you are going to use your cross-toolchain for an ARM-based target, go into the 
                     <filename>x86_64</filename> folder and download the following tarball:
                     <literallayout class='monospaced'>
-     poky-eglibc-x86_64-i586-toolchain-gmae-&DISTRO;.tar.bz2
-                    </literallayout>
-                    <note><para>As an alternative to steps one and two, you can build the toolchain tarball 
+     yocto-eglibc-x86_64-arm-toolchain-gmae-1.1.tar.bz2
+                   </literallayout>
+                    <note>As an alternative to steps one and two, you can build the toolchain tarball 
                         if you have a Yocto Project build tree.
-                        If you need GMAE, you should use the <filename>bitbake meta-toolchain-gmae</filename>
-                        command. 
-                        The resulting tarball will support such development.
-                        However, if you are not concerned with GMAE, 
-                        you can generate the tarball using <filename>bitbake meta-toolchain</filename>.</para>
-                        <para>Use the appropriate <filename>bitbake</filename> command only after you have 
-                        sourced the <filename>oe-build-init-env</filename> script located in the Yocto 
+                        Use the <filename>bitbake meta-toolchain</filename> command after you have 
+                        sourced the <filename>oe-build-init script</filename> located in the Yocto 
                         Project files.  
-                        When the <filename>bitbake</filename> command completes, the tarball will 
+                        When the <filename>bitbake</filename> command completes, the toolchain tarball will 
                         be in <filename>tmp/deploy/sdk</filename> in the Yocto Project build tree.
-                        </para></note></para></listitem>
+                        </note></para></listitem>
                 <listitem><para>Make sure you are in the root directory with root privileges and then expand 
                     the tarball.  
-                    The tarball expands into <filename>&YOCTO_ADTPATH_DIR;</filename>.
-                    Once the tarball is expanded, the cross-toolchain is installed.
+                    The tarball expands into <filename>/opt/poky/$SDKVERSION</filename>.
+                    Once the tarball in unpacked, the cross-toolchain is installed.
                     You will notice environment setup files for the cross-toolchain in the directory.
                     </para></listitem>
             </orderedlist>
         </para>
+
+        <para>
+            After installing the toolchain, you must locate the target sysroot tarball and unpack it
+            into a location of your choice.
+        </para>  
     </section>
 
     <section id='using-the-toolchain-from-within-the-build-tree'>
         <title>Using BitBake and the Yocto Project Build Tree</title>
 
         <para>
-            A final way of installing just the cross-toolchain is to use BitBake to build the 
-            toolchain within an existing Yocto Project build tree.
-            This method does not install the toolchain into the <filename>/opt</filename> directory.
-            As with the previous method, if you need to install the target sysroot, you must 
-            do this separately.
-        </para>
-
-        <para>
-            Follow these steps to build and install the toolchain into the build tree:
+            A final way of installing just the cross-toolchain is to use BitBake within an existing 
+            Yocto Project build tree.
+            Follow these steps:
             <orderedlist>
-                <listitem><para>Source the environment setup script 
-                    <filename>oe-init-build-env</filename> located in the Yocto Project
-                    files.</para></listitem> 
+                <listitem><para>Source the environment setup script located in the Yocto Project
+                    files.
+                    The script has the string <filename>init-build-env</filename>
+                    as part of the name.</para></listitem> 
                 <listitem><para>At this point, you should be sure that the 
                     <filename>MACHINE</filename> variable 
-                    in the <filename>local.conf</filename> file found in the 
-                    <filename>conf</filename> directory of the Yocto Project build directory
+                    in the <filename>local.conf</filename> file found in the Yocto Project 
+                    file structure's <filename>conf</filename> directory 
                     is set for the target architecture.
                     Comments within the <filename>local.conf</filename> file list the values you 
                     can use for the <filename>MACHINE</filename> variable.  
@@ -282,34 +313,39 @@
                         command.</note></para></listitem>
                 <listitem><para>Run <filename>bitbake meta-ide-support</filename> to complete the 
                     cross-toolchain installation.
-                    <note>If change out of your working directory after you 
+                    <note>If you change your working directory after you 
                         <filename>source</filename> the environment setup script and before you run
-                        the <filename>bitbake</filename> command, the command might not work. 
+                        the BitBake command, the command will not work. 
                         Be sure to run the <filename>bitbake</filename> command immediately 
                         after checking or editing the <filename>local.conf</filename> but without 
-                        changing out of your working directory.</note>
-                    Once the <filename>bitbake</filename> command finishes, 
-                    the tarball for the cross-toolchain is generated within the Yocto Project build tree.
+                        changing your working directory.</note>
+                    Once BitBake finishes, the cross-toolchain is installed.
                     You will notice environment setup files for the cross-toolchain in the 
                     Yocto Project build tree in the <filename>tmp</filename> directory.
                     Setup script filenames contain the strings <filename>environment-setup</filename>.
                     </para></listitem>
             </orderedlist>
         </para>
+
+        <para>
+            After installing the toolchain, you must locate the target sysroot tarball and unpack
+            it in a directory of your choice.
+        </para>
     </section>
 </section>
 
-<section id='setting-up-the-cross-development-environment'>
-    <title>Setting Up the Cross-Development Environment</title>
+<section id='setting-up-the-environment'>
+    <title>Setting Up the Environment</title>
 
     <para>
-        Before you can develop using the cross-toolchain, you need to set up the 
-        cross-development environment by sourcing the toolchain's environment setup script.  
+        Before you can use the cross-toolchain, you need to set up the toolchain environment by 
+        sourcing the environment setup script.  
         If you used the ADT Installer or used an existing ADT tarball to install the ADT,
-        then you can find this script in the <filename>&YOCTO_ADTPATH_DIR;</filename>
+        then you can find this script in the <filename>/opt/poky/$SDKVERSION</filename>
         directory.  
-        If you installed the toolchain in the build tree, you can find the environment setup 
-        script for the toolchain in the Yocto Project build tree's <filename>tmp</filename> directory.
+        If you used BitBake and the Yocto Project Build Tree to install the cross-toolchain,
+        then you can find the environment setup scripts in in the Yocto Project build tree 
+        in the <filename>tmp</filename> directory.
     </para>
 
     <para> 
@@ -317,133 +353,43 @@
         which you are developing.  
         Environment setup scripts begin with the string “<filename>environment-setup</filename>”
         and include as part of their name the architecture.  
-        For example, the toolchain environment setup script for a 64-bit IA-based architecture would 
+        For example, the environment setup script for a 64-bit IA-based architecture would 
         be the following: 
         <literallayout class='monospaced'>
-     &YOCTO_ADTPATH_DIR;/environment-setup-x86_64-poky-linux
+     /opt/poky/1.1/environment-setup-x86_64-poky-linux
         </literallayout>
     </para>
 </section>
 
-<section id='securing-kernel-and-filesystem-images'>
-    <title>Securing Kernel and Filesystem Images</title>
+<section id='kernels-and-filesystem-images'>
+    <title>Kernels and Filesystem Images</title>
 
     <para>
         You will need to have a kernel and filesystem image to boot using your 
-        hardware or the QEMU emulator.
-        Furthermore, if you plan on booting your image using NFS or you want to use the root filesystem
-        as the target sysroot, you need to extract the root filesystem.
-    </para>
-
-    <section id='getting-the-images'>
-        <title>Getting the Images</title>
-
-        <para>
-            To get the kernel and filesystem images, you either have to build them or download
-            pre-built versions.
-            You can find examples for both these situations in the 
-            "<ulink url='&YOCTO_DOCS_QS_URL;#test-run'>A Quick Test Run</ulink>" section of   
-            The Yocto Project Quick Start.
-        </para>
-
-        <para> 
-            The Yocto Project provides basic kernel and filesystem images for several 
+        hardware or the QEMU emulator.  
+        That means you either have to build them or know where to get them.
+        You can find a quick example of how to build an image in the 
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>
+        Building an Image</ulink> section of   
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+        The Yocto Project Quick Start</ulink>.
+        <note><para> 
+            The Yocto Project provides basic kernels and filesystem images for several 
             architectures (<filename>x86</filename>, <filename>x86-64</filename>, 
             <filename>mips</filename>, <filename>powerpc</filename>, and <filename>arm</filename>) 
             that you can use unaltered in the QEMU emulator.  
-            These kernel images reside in the Yocto Project release 
-            area - <ulink url='&YOCTO_MACHINES_DL_URL;'></ulink>
-            and are ideal for experimentation within Yocto Project.
-            For information on the image types you can build using the Yocto Project, see the
-            "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>" appendix in  
-            The Yocto Project Reference Manual.
-        </para>
-
-        <para>
-            If you plan on remotely deploying and debugging your application from within the 
-            Eclipse IDE, you must have an image that contains the Yocto Target Communication
-            Framework (TCF) agent (<filename>tcf-agent</filename>). 
-            By default, the Yocto Project provides only one type pre-built image that contains the 
-            <filename>tcf-agent</filename>.
-            And, those images are SDK (e.g.<filename>core-image-sato-sdk</filename>).
-        </para>
-
-        <para>
-            If you want to use a different image type that contains the <filename>tcf-agent</filename>, 
-            you can do so one of two ways:
-            <itemizedlist>
-                <listitem><para>Modify the <filename>conf/local.conf</filename> configuration file in 
-                    the Yocto Project build directory and then rebuild the image.
-                    With this method, you need to modify the <filename>EXTRA_IMAGE_FEATURES</filename>
-                    variable to have the value of "tools-debug" before rebuilding the image. 
-                    Once the image is rebuilt, the <filename>tcf-agent</filename> will be included
-                    in the image and is launched automatically after the boot.</para></listitem>
-                <listitem><para>Manually build the <filename>tcf-agent</filename>.
-                    To build the agent, follow these steps:
-                    <orderedlist>
-                        <listitem><para>Be sure the ADT is installed as described in the 
-                            "<link linkend='installing-the-adt'>Installing the ADT</link>" section.
-                            </para></listitem>
-                        <listitem><para>Set up the cross-development environment as described in the 
-                            "<link linkend='setting-up-the-cross-development-environment'>Setting 
-                            Up the Cross-Development Environment</link>" section.</para></listitem>
-                        <listitem><para>Get the <filename>tcf-agent</filename> source code using
-                            the following commands:
-                            <literallayout class='monospaced'>
-     $ git clone http://git.eclipse.org/gitroot/tcf/org.eclipse.tcf.agent.git
-     $ cd agent
-                            </literallayout></para></listitem>
-                        <listitem><para>Modify the <filename>Makefile.inc</filename> file
-                            for the cross-compilation environment by setting the 
-                            <filename>OPSYS</filename> and <filename>MACHINE</filename>
-                            variables according to your target.</para></listitem>
-                        <listitem><para>Use the cross-development tools to build the 
-                            <filename>tcf-agent</filename>.  
-                            Before you "Make" the file, be sure your cross-tools are set up first.
-                            See the "<link linkend='makefile-based-projects'>Makefile-Based Projects</link>"
-                            section for information on how to make sure the cross-tools are set up
-                            correctly.</para>
-                            <para>If the build is successful, the <filename>tcf-agent</filename> output will 
-                            be <filename>obj/$(OPSYS)/$(MACHINE)/Debug/agent</filename>.</para></listitem>
-                        <listitem><para>Deploy the agent into the image's root filesystem.</para></listitem>
-                    </orderedlist>
-                </para></listitem>
-            </itemizedlist>
-        </para>
-    </section>
-
-    <section id='extracting-the-root-filesystem'>
-        <title>Extracting the Root Filesystem</title>
-
-        <para>
-            You must extract the root filesystem if you want to boot the image using NFS
-            or you want to use the root filesystem as the target sysroot.
-            For example, the Eclipse IDE environment with the Eclipse Yocto Plug-in installed allows you 
-            to use QEMU to boot under NFS.
-            Another example is if you want to develop your target application using the
-            root filesystem as the target sysroot. 
-        </para>
-
-        <para> 
-            To extract the root filesystem, first <filename>source</filename>
-            the cross-development environment setup script and then 
-            use the <filename>runqemu-extract-sdk</filename> command on the 
-            filesystem image. 
-            For example, the following commands set up the environment and then extract
-            the root filesystem from a previously built filesystem image tarball named  
-            <filename>core-image-sato-sdk-qemux86.tar.bz2</filename>.
-            The example extracts the root filesystem into the <filename>$HOME/qemux86-sato</filename>
-            directory:
-            <literallayout class='monospaced'>
-     $ source $HOME/poky/build/tmp/environment-setup-i586-poky-linux
-     $ runqemu-extract-sdk \
-        tmp/deploy/images/core-image-sato-sdk-qemux86.tar.bz2 \
-        $HOME/qemux86-sato
-            </literallayout>
-            In this case, you could now point to the target sysroot at 
-            <filename>$HOME/qemux86-sato</filename>.
-        </para>
-    </section>
+            These kernels and filesystem images reside in the Yocto Project release 
+            area - <ulink url='http://autobuilder.yoctoproject.org/downloads/yocto-1.1/machines/'></ulink>
+            and are ideal for experimentation within Yocto Project.</para>
+            <para>If you plan on remotely deploying and debugging your application from within the 
+            Eclipse IDE, you must have an image that supports Sato.
+            For information on the image types you can build using the Yocto Project, see
+            <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>
+            Reference: Images</ulink> in  
+            <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+            The Yocto Project Reference Manual</ulink>.</para>
+        </note>
+    </para>
 </section>
 
 </chapter>

documentation/adt-manual/style.css

@@ -654,7 +654,7 @@ hr {
 
 
 .tip, .warning, .caution, .note {
-  border-color: #fff;
+  border-color: #aaa;
 }
 
 
@@ -662,24 +662,24 @@ hr {
 .warning table th,
 .caution table th,
 .note table th {
-  border-bottom-color: #fff;
+  border-bottom-color: #aaa;
 }
 
 
 .warning {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .caution {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .tip {
-  background-color: #f0f0f2;
+  background-color: #eff;
 }
 
 .note {
-  background-color: #f0f0f2; 
+  background-color: #dfc;
 }
 
 .glossary dl dt, 
@@ -946,8 +946,8 @@ table {
 
 .tip,
 .note {
-   background: #f0f0f2; 
-   color: #333;   
+   background: #666666;
+   color: #fff;   
    padding: 20px;
    margin: 20px;
 }
@@ -958,26 +958,11 @@ table {
    margin: 0em;
    font-size: 2em;
    font-weight: bold;
-   color: #333;   
+   color: #fff;   
 }
 
 .tip a,
 .note a {
-   color: #333;   
+   color: #fff;   
    text-decoration: underline;
 }
-
-.footnote {
-   font-size: small;
-   color: #333;
-}
-
-/* Changes the announcement text */
-.tip h3,
-.warning h3,
-.caution h3,
-.note h3 {
-   font-size:large;
-   color: #00557D;
-}
-

documentation/bsp-guide/bsp-guide.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <book id='bsp-guide' lang='en' 
       xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -19,17 +18,10 @@
         <title></title> 
 
         <authorgroup>
-            <author>
-                <firstname>Tom</firstname> <surname>Zanussi</surname>
-                <affiliation>
-                    <orgname>Intel Corporation</orgname>
-                </affiliation>
-                <email>tom.zanussi@intel.com</email>
-            </author>
             <author>
                 <firstname>Richard</firstname> <surname>Purdie</surname>
                 <affiliation>
-                    <orgname>Linux Foundation</orgname>
+                    <orgname>Intel Corporation</orgname>
                 </affiliation>
                 <email>richard.purdie@linuxfoundation.org</email>
             </author>
@@ -38,38 +30,24 @@
         <revhistory>
             <revision>
                 <revnumber>0.9</revnumber>
-                <date>24 November 2010</date>
-                <revremark>The initial document draft released with the Yocto Project 0.9 Release.</revremark>
+                <date>27 October 2010</date>
+                <revremark>This manual revision is the initial manual and corresponds to the 
+                    Yocto Project 0.9 Release.</revremark>
             </revision>
             <revision>
                 <revnumber>1.0</revnumber>
                 <date>6 April 2011</date>
-                <revremark>Released with the Yocto Project 1.0 Release.</revremark>
+                <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 the Yocto Project 1.0.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1</revnumber>
-                <date>6 October 2011</date>
-                <revremark>Released with the Yocto Project 1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.1</revnumber>
-                <date>15 March 2012</date>
-                <revremark>Released with the Yocto Project 1.1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.2</revnumber>
-                <date>July 2012</date>
-                <revremark>Released with the Yocto Project 1.1.2 Release.</revremark>
+                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
             </revision>
         </revhistory>
 
     <copyright>
-      <year>&COPYRIGHT_YEAR;</year>
+      <year>2010-2011</year>
       <holder>Linux Foundation</holder>
     </copyright>
 
@@ -81,9 +59,9 @@
       <note>
           Due to production processes, there could be differences between the Yocto Project
           documentation bundled in the release tarball and the 
-          <ulink url='&YOCTO_DOCS_BSP_URL;'>
+          <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html'>
           Board Support Package (BSP) Developer's Guide</ulink> on
-          the <ulink url='&YOCTO_HOME_URL;'>Yocto Project</ulink> website.
+          the <ulink url='http://www.yoctoproject.org'>Yocto Project</ulink> website.
           For the latest version of this manual, see the manual on the website.
       </note>
     </legalnotice>

documentation/bsp-guide/style.css

@@ -654,7 +654,7 @@ hr {
 
 
 .tip, .warning, .caution, .note {
-  border-color: #fff;
+  border-color: #aaa;
 }
 
 
@@ -662,24 +662,24 @@ hr {
 .warning table th,
 .caution table th,
 .note table th {
-  border-bottom-color: #fff;
+  border-bottom-color: #aaa;
 }
 
 
 .warning {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .caution {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .tip {
-  background-color: #f0f0f2;
+  background-color: #eff;
 }
 
 .note {
-  background-color: #f0f0f2; 
+  background-color: #dfc;
 }
 
 .glossary dl dt, 
@@ -771,17 +771,6 @@ h6,
 h7{
 }
 
-/*
-Example of how to stick an image as part of the title.
-
-div.article .titlepage .title
-{
-  background-image: url("figures/white-on-black.png");
-  background-position: center;
-  background-repeat: repeat-x;
-}
-*/
-
 div.preface .titlepage .title, 
 div.colophon .title, 
 div.chapter .titlepage .title {
@@ -947,8 +936,8 @@ table {
 
 .tip,
 .note {
-   background: #f0f0f2; 
-   color: #333;   
+   background: #666666;
+   color: #fff;   
    padding: 20px;
    margin: 20px;
 }
@@ -959,26 +948,11 @@ table {
    margin: 0em;
    font-size: 2em;
    font-weight: bold;
-   color: #333;   
+   color: #fff;   
 }
 
 .tip a,
 .note a {
-   color: #333;   
+   color: #fff;   
    text-decoration: underline;
 }
-
-.footnote {
-   font-size: small;
-   color: #333;
-}
-
-/* Changes the announcement text */
-.tip h3,
-.warning h3,
-.caution h3,
-.note h3 {
-   font-size:large;
-   color: #00557D;
-}
-

documentation/dev-manual/dev-manual-bsp-appendix.xml

@@ -1,21 +1,17 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='dev-manual-bsp-appendix'>
 
 <title>BSP Development Example</title>
 
 <para>
-    This appendix provides a complete BSP development example.
+    This appendix provides a complete BSP example.
     The example assumes the following:
     <itemizedlist>
         <listitem><para>No previous preparation or use of the Yocto Project.</para></listitem>
-        <listitem><para>Use of the Crown Bay Board Support Package (BSP) as a "base" BSP from 
-            which to work.  
-            The example begins with the Crown Bay BSP as the starting point
-            but ends by building a new 'atom-pc' BSP, which was based on the Crown Bay BSP.
-            </para></listitem>  
+        <listitem><para>Use of the Crown Bay Board Support Package (BSP) as a base BSP from 
+            which to work from.</para></listitem>  
         <listitem><para>Shell commands assume <filename>bash</filename></para></listitem>
         <listitem><para>Example was developed on an Intel-based Core i7 platform running 
             Ubuntu 10.04 LTS released in April of 2010.</para></listitem>        
@@ -28,100 +24,47 @@
     <para>
         You need to have the Yocto Project files available on your host system.  
         You can get files through tarball extraction or by cloning the <filename>poky</filename>
-        Git repository.
-        The following paragraphs describe both methods.
-        For additional information, see the bulleted item
-        "<link linkend='local-yp-release'>Yocto Project Release</link>".
-    </para> 
-
-    <para>
-        As mentioned, one way to get the Yocto Project files is to use Git to clone the 
-        <filename>poky</filename> repository. 
-        These commands create a local copy of the Git repository.
-        By default, the top-level directory of the repository is named <filename>poky</filename>:
-        <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/poky
-     $ cd poky
-        </literallayout> 
-        Alternatively, you can start with the downloaded Poky "&DISTRO_NAME;" tarball.
-        These commands unpack the tarball into a Yocto Project File directory structure.
-        By default, the top-level directory of the file structure is named
-        <filename>&YOCTO_POKY;</filename>:
-        <literallayout class='monospaced'>
-     $ tar xfj &YOCTO_POKY_TARBALL;
-     $ cd &YOCTO_POKY;
-        </literallayout> 
-        <note><para>If you're using the tarball method, you can ignore all the following steps that
-        ask you to carry out Git operations.  
-        You already have the results of those operations
-        in the form of the &DISTRO_NAME; release tarballs.
-        Consequently, there is nothing left to do other than extract those tarballs into the 
-        proper locations.</para>
-
-        <para>Once you expand the released tarball, you have a snapshot of the Git repository
-        that represents a specific release.
-        Fundamentally, this is different than having a local copy of the Yocto Project 
         Git repository.  
-        Given the tarball method, changes you make are building on top of a release.
-        With the Git repository method you have the ability to track development
-        and keep changes in revision control.</para></note>
+        See the bulleted item
+        <link linkend='local-yp-release'>Yocto Project Release</link> in
+        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+        for information on how to get these files.
     </para>
 
     <para>
-        With the local <filename>poky</filename> Git repository set up, 
-        you have all the development branches available to you from which you can work. 
-        Next, you need to be sure that your local repository reflects the exact
-        release in which you are interested.
-        From inside the repository you can see the development branches that represent
-        areas of development that have diverged from the main (master) branch
-        at some point, such as a branch to track a maintenance release's development.  
-        You can also see the tag names used to mark snapshots of stable releases or 
-        points in the repository.
-        Use the following commands to list out the branches and the tags in the repository, 
-        respectively.
+        Once you have the local <filename>poky</filename> Git repository set up, 
+        you have many development branches from which you can work. 
+        From inside the repository you can see the branch names and the tag names used 
+        in the Git repository using either of the following two commands:
         <literallayout class='monospaced'>
      $ git branch -a
      $ git tag -l
         </literallayout> 
-        For this example, we are going to use the Yocto Project &DISTRO; Release, which is code
-        named "&DISTRO_NAME;". 
-        To make sure we have a local area (branch in Git terms) on our machine that 
-        reflects the &DISTRO; release, we can use the following commands:
+        For this example we are going to use the Yocto Project 1.1 Release, 
+        which maps to the <filename>1.1</filename> branch in the repository. 
+        These commands create a local branch named <filename>1.1</filename>
+        that tracks the remote branch of the same name.
         <literallayout class='monospaced'>
-     $ cd ~/poky
-     $ git fetch --tags
-     $ git checkout &DISTRO_NAME;-&POKYVERSION; -b &DISTRO_NAME;
-     Switched to a new branch '&DISTRO_NAME;'
+     $ cd poky
+     $ git checkout -b 1.1 origin/1.1
+     Switched to a new branch '1.1'
         </literallayout>
-        The <filename>git fetch --tags</filename> is somewhat redundant since you just set 
-        up the repository and should have all the tags.
-        The <filename>fetch</filename> command makes sure all the tags are available in your
-        local repository.
-        The Git <filename>checkout</filename> command with the <filename>-b</filename> option
-        creates a local branch for you named <filename>&DISTRO_NAME;</filename>.
-        Your local branch begins in the same state as the Yocto Project &DISTRO; released tarball 
-        marked with the <filename>&DISTRO_NAME;-&POKYVERSION;</filename> tag in the source repositories.
     </para>
-</section> 
+</section>
 
 <section id='choosing-a-base-bsp-app'>
     <title>Choosing a Base BSP</title>
 
     <para>
-        For this example, the base BSP is the <trademark class='registered'>Intel</trademark>
-        <trademark class='trade'>Atom</trademark> Processor E660 with Intel Platform 
+        For this example, the base BSP is the Intel Atom Processor E660 with Intel Platform 
         Controller Hub EG20T Development Kit, which is otherwise referred to as "Crown Bay."
-        The BSP layer is <filename>meta-crownbay</filename>.  
-        The base BSP is simply the BSP
-        we will be using as a starting point, so don't worry if you don't actually have Crown Bay
-        hardware.
-        The remainder of the example transforms the base BSP into a BSP that should be
-        able to boot on generic atom-pc (netbook) hardware.
+        The BSP layer is <filename>meta-crownbay</filename>.
     </para>
 
     <para>
         For information on how to choose a base BSP, see
-        "<link linkend='developing-a-board-support-package-bsp'>Developing a Board Support Package (BSP)</link>".
+        <xref linkend='developing-a-board-support-package-bsp'>Developing a Board Support Package (BSP)</xref>
+        earlier in this manual.
     </para>
 </section>
 
@@ -130,60 +73,30 @@
 
     <para>
         You need to have the base BSP layer on your development system.  
-        Similar to the local Yocto Project files, you can get the BSP 
-        layer in couple of different ways:  
+        Like the local Yocto Project files, you can get the BSP 
+        layer one of two ways:  
         download the BSP tarball and extract it, or set up a local Git repository that 
         has the Yocto Project BSP layers.  
         You should use the same method that you used to get the local Yocto Project files earlier.
-        See "<link linkend='getting-setup'>Getting Setup</link>" for information on how to get 
-        the BSP files.
-    </para>
-
-    <para>
-        This example assumes the BSP layer will be located within a directory named
-        <filename>meta-intel</filename> contained within the <filename>poky</filename>
-        parent directory.  
-        The following steps will automatically create the
-        <filename>meta-intel</filename> directory and the contained 
-        <filename>meta-crownbay</filename> starting point in both the Git and the tarball cases.
-    </para>
-
-    <para>
-        If you're using the Git method, you could do the following to create
-        the starting layout after you have made sure you are in the <filename>poky</filename>
-        directory created in the previous steps:
-        <literallayout class='monospaced'>
-     $ git clone git://git.yoctoproject.org/meta-intel.git
-     $ cd meta-intel
-        </literallayout> 
-        Alternatively, you can start with the downloaded Crown Bay tarball.
-        You can download the &DISTRO_NAME; version of the BSP tarball from the
-        <ulink url='&YOCTO_HOME_URL;/download'>Download</ulink> page of the 
-        Yocto Project website. 
-        Here is the specific link for the tarball needed for this example:
-        <ulink url='&YOCTO_DL_URL;/releases/yocto/yocto-1.1/machines/crownbay-noemgd/crownbay-noemgd-edison-6.0.0.tar.bz2'></ulink>.
-        Again, be sure that you are already in the <filename>poky</filename> directory
-        as described previously before installing the tarball:
-        <literallayout class='monospaced'>
-     $ tar xfj crownbay-noemgd-&DISTRO_NAME;-6.0.0.tar.bz2
-     $ cd meta-intel
-        </literallayout> 
+        See <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
+        for information on how to get the BSP files.
     </para>
         
     <para>
-        The <filename>meta-intel</filename> directory contains all the metadata 
-        that supports BSP creation.  
-        If you're using the Git method, the following
-        step will switch to the &DISTRO_NAME; metadata.
-        If you're using the tarball method, you already have the correct metadata and can 
-        skip to the next step.
+        This example assumes a local <filename>meta-intel</filename> Git repository
+        inside the local <filename>poky</filename> Git repository.
+        The <filename>meta-intel</filename> Git repository contains all the metadata 
+        that supports BSP creation.
+    </para>
+
+    <para>
         Because <filename>meta-intel</filename> is its own Git repository, you will want
         to be sure you are in the appropriate branch for your work.
-        For this example we are going to use the <filename>&DISTRO_NAME;</filename> branch. 
+        For this example we are going to use the <filename>1.1</filename> branch. 
         <literallayout class='monospaced'>
-     $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
-     Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
-     Switched to a new branch '&DISTRO_NAME;'
+     $ cd meta-intel
+     $ git checkout -b 1.1 origin/1.1
+     Switched to a new branch 'bernard'
         </literallayout>
     </para>
 </section>
@@ -192,20 +105,23 @@
     <title>Making a Copy of the Base BSP to Create Your New BSP Layer</title>
 
     <para>
-        Now that you have the local Yocto Project files and the base BSP files, you need to create a 
+        Now that you have the local Yocto Project files and the base BSP files you need to create a 
         new layer for your BSP.
-        To create your BSP layer, you simply copy the <filename>meta-crownbay</filename>
+        To create your BSP layer you simply copy the <filename>meta-crownbay</filename>
         layer to a new layer.
     </para>
 
     <para>  
-        For this example, the new layer will be named <filename>meta-mymachine</filename>.  
-        The name should follow the BSP layer naming convention, which is 
+        For this example the new layer will be named <filename>meta-mymachine</filename>.  
+        The name must follow the BSP layer naming convention, which is 
         <filename>meta-&lt;name&gt;</filename>.  
-        The following assumes your working directory is <filename>meta-intel</filename> 
+        The following example assumes your working directory is <filename>meta-intel</filename> 
         inside the local Yocto Project files.  
-        To start your new layer, just copy the new layer alongside the existing
-        BSP layers in the <filename>meta-intel</filename> directory:
+        If you downloaded and expanded a Crown Bay tarball then you simply copy the resulting 
+        <filename>meta-crownbay</filename> directory structure to a location of your choice.
+        Good practice for a Git repository, however, is to just copy the new layer alongside 
+        the existing
+        BSP layers in the <filename>meta-intel</filename> Git repository:
         <literallayout class='monospaced'>
      $ cp -a meta-crownbay/ meta-mymachine 
         </literallayout>
@@ -232,7 +148,7 @@
         </para>
 
         <para>
-            First, since in this example the new BSP will not support EMGD, we will get rid of the 
+            First, since in this example the new BSP will not support EMGD we will get rid of the 
             <filename>crownbay.conf</filename> file and then rename the 
             <filename>crownbay-noemgd.conf</filename> file to <filename>mymachine.conf</filename>.  
             Much of what we do in the configuration directory is designed to help the Yocto Project 
@@ -247,31 +163,26 @@
         </para>
 
         <para>
-            Next, we need to make changes to the <filename>mymachine.conf</filename> itself.
-            The only changes we want to make for this example are to the comment lines.  
-            Changing comments, of course, is never strictly necessary, but it's alway good form to make
-            them reflect reality as much as possible.
-
-            Here, simply substitute the Crown Bay name with an appropriate name for the BSP 
-            (<filename>mymachine</filename> in this case) and change the description to 
-            something that describes your hardware.
+            The next step makes changes to <filename>mymachine.conf</filename> itself.  
+            The only changes needed for this example are changes to the comment lines.
+            Here we simply substitute the Crown Bay name with an appropriate name.
         </para>
 
         <para>
             Note that inside the <filename>mymachine.conf</filename> is the 
             <filename>PREFERRED_PROVIDER_virtual/kernel</filename> statement. 
             This statement identifies the kernel that the BSP is going to use.
-            In this case, the BSP is using <filename>linux-yocto</filename>, which is the 
+            In this case the BSP is using <filename>linux-yocto</filename>, which is the 
             current Linux Yocto kernel based on the Linux 3.0 release. 
         </para>
 
         <para>
-            The next configuration file in the new BSP layer we need to edit is
-            <filename>meta-mymachine/conf/layer.conf</filename>.
+            The next configuration file in the new BSP layer we need to edit is <filename>layer.conf</filename>.
             This file identifies build information needed for the new layer.  
             You can see the 
-            "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-filelayout-layer'>Layer Configuration File</ulink>" section
-            in The Board Support Packages (BSP) Development Guide for more information on this configuration file.  
+            <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html#bsp-filelayout-layer'>
+            Layer Configuration File</ulink> section in the Board Support Packages (BSP) Development Guide
+            for more information on this configuration file.  
             Basically, we are changing the existing statements to work with our BSP. 
         </para>
 
@@ -301,11 +212,10 @@
         <para>
             Now we will take a look at the recipes in your new layer.  
             The standard BSP structure has areas for BSP, graphics, core, and kernel recipes.  
-            When you create a BSP, you use these areas for appropriate recipes and append files.  
-            Recipes take the form of <filename>.bb</filename> files, while append files take
-            the form of <filename>.bbappend</filename> files.  
+            When you create a BSP you use these areas for appropriate recipes and append files.  
+            Recipes take the form of <filename>.bb</filename> files.  
             If you want to leverage the existing recipes the Yocto Project build system uses
-            but change those recipes, you can use <filename>.bbappend</filename> files.  
+            but change those recipes you can use <filename>.bbappend</filename> files.  
             All new recipes and append files for your layer must go in the layer’s 
             <filename>recipes-bsp</filename>, <filename>recipes-kernel</filename>, 
             <filename>recipes-core</filename>, and 
@@ -313,7 +223,7 @@
         </para>
 
         <section id='changing-recipes-bsp'>
-            <title>Changing&nbsp;&nbsp;<filename>recipes-bsp</filename></title>
+            <title>Changing <filename>recipes-bsp</filename></title>
 
             <para>
                 First, let's look at <filename>recipes-bsp</filename>.
@@ -322,7 +232,7 @@
                 the remaining one that doesn't support EMGD.  
                 These commands take care of the <filename>recipes-bsp</filename> recipes:
                 <literallayout class='monospaced'>
-     $ rm -rf meta-mymachine/recipes-bsp/formfactor/formfactor/crownbay
+     $ rm -rf meta-mymachine/recipes-graphics/xorg-xserver/*emgd*
      $ mv meta-mymachine/recipes-bsp/formfactor/formfactor/crownbay-noemgd/ \
      meta-mymachine/recipes-bsp/formfactor/formfactor/mymachine
                 </literallayout>
@@ -330,7 +240,7 @@
         </section>
 
         <section id='changing-recipes-graphics'>
-            <title>Changing&nbsp;&nbsp;<filename>recipes-graphics</filename></title>
+            <title>Changing <filename>recipes-graphics</filename></title>
 
             <para>
                 Now let's look at <filename>recipes-graphics</filename>.
@@ -338,6 +248,7 @@
                 be sure to rename remaining directories appropriately.  
                 The following commands clean up the <filename>recipes-graphics</filename> directory:
                 <literallayout class='monospaced'>
+     $ rm -rf meta-mymachine/recipes-graphics/xorg-xserver/xserver-xf86-emgd*
      $ rm -rf meta-mymachine/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay
      $ mv meta-mymachine/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd \
         meta-mymachine/recipes-graphics/xorg-xserver/xserver-xf86-config/mymachine   
@@ -351,7 +262,7 @@
         </section>
 
         <section id='changing-recipes-core'>
-            <title>Changing&nbsp;&nbsp;<filename>recipes-core</filename></title>
+            <title>Changing <filename>recipes-core</filename></title>
 
             <para>
                 Now let's look at changes in <filename>recipes-core</filename>.
@@ -359,7 +270,7 @@
                 <filename>recipes-core/tasks</filename> appends the similarly named recipe
                 located in the local Yocto Project files at 
                 <filename>meta/recipes-core/tasks</filename>.
-                The append file in our layer right now is Crown Bay-specific and supports 
+                The "append" file in our layer right now is Crown Bay-specific and supports 
                 EMGD and non-EMGD.
                 Here are the contents of the file:
                 <literallayout class='monospaced'>
@@ -380,7 +291,7 @@
         </section>
 
         <section id='changing-recipes-kernel'>
-            <title>Changing&nbsp;&nbsp;<filename>recipes-kernel</filename></title>
+            <title>Changing <filename>recipes-kernel</filename></title>
 
             <para>
                 Finally, let's look at <filename>recipes-kernel</filename> changes.
@@ -393,38 +304,31 @@
                 The <filename>SRCREV_machine</filename> and <filename>SRCREV_meta</filename>
                 statements point to the exact commits used by the Yocto Project development team
                 in their source repositories that identify the right kernel for our hardware.
-                In other words, the <filename>SRCREV</filename> values are simply Git commit 
-                IDs that identify which commit on each
-                of the kernel branches (machine and meta) will be checked out and used to build
-                the kernel.
             </para>
  
             <para>
                 However, in the <filename>meta-mymachine</filename> layer in 
                 <filename>recipes-kernel/linux</filename> resides a <filename>.bbappend</filename>
                 file named <filename>linux-yocto_3.0.bbappend</filename> that 
-                appends information to the recipe of the same name in <filename>meta/recipes-kernel/linux</filename>.
-                Thus, the <filename>SRCREV</filename> statements in the append file override
+                is appended to the recipe of the same name in <filename>meta/recipes-kernel/link</filename>.
+                Thus, the <filename>SRCREV</filename> statements in the "append" file override
                 the more general statements found in <filename>meta</filename>.
             </para>
 
             <para>
-                The <filename>SRCREV</filename> statements in the append file currently identify
+                The <filename>SRCREV</filename> statements in the "append" file currently identify
                 the kernel that supports the Crown Bay BSP with and without EMGD support.
-                Here are the statements:
-                <note>The commit ID strings used in this manual might not match the actual commit
-                    ID strings found in the <filename>linux-yocto_3.0.bbappend</filename> file.
-                    For the example, this difference does not matter.</note> 
+                Here are the statements: 
                 <literallayout class='monospaced'>
      SRCREV_machine_pn-linux-yocto_crownbay ?= \
-        "2247da9131ea7e46ed4766a69bb1353dba22f873"
+        "372c0ab135978bd8ca3a77c88816a25c5ed8f303"
      SRCREV_meta_pn-linux-yocto_crownbay ?= \
-        "d05450e4aef02c1b7137398ab3a9f8f96da74f52"
+        "d5d3c6480d61f83503ccef7fbcd765f7aca8b71b"
 
      SRCREV_machine_pn-linux-yocto_crownbay-noemgd ?= \
-        "2247da9131ea7e46ed4766a69bb1353dba22f873"
+        "372c0ab135978bd8ca3a77c88816a25c5ed8f303"
      SRCREV_meta_pn-linux-yocto_crownbay-noemgd ?= \
-        "d05450e4aef02c1b7137398ab3a9f8f96da74f52"
+        "d5d3c6480d61f83503ccef7fbcd765f7aca8b71b"
                 </literallayout>
             </para>
 
@@ -439,52 +343,30 @@
             </para>
 
             <para>  
-                To fix this situation in <filename>linux-yocto_3.0.bbappend</filename>,
+                To fix this situation in <filename>linux-yocto_3.0.bbappend</filename>
                 we delete the two <filename>SRCREV</filename> statements that support 
-                EMGD (the top pair).
+               EMGD (the top pair).
                 We also change the remaining pair to specify <filename>mymachine</filename>
                 and insert the commit identifiers to identify the kernel in which we 
                 are interested, which will be based on the <filename>atom-pc-standard</filename>
                 kernel.
-                In this case, because we're working with the &DISTRO_NAME; branch of everything, we
-                need to use the <filename>SRCREV</filename> values for the atom-pc branch
-                that are associated with the &DISTRO_NAME; release.  
-                To find those values, we need to find the <filename>SRCREV</filename>
-                values that &DISTRO_NAME; uses for the atom-pc branch, which we find in the
-                <filename>poky/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend</filename>
-                file.
-            </para>
-
-            <para>  
-                The machine <filename>SRCREV</filename> we want is in the 
-                <filename>SRCREV_machine_atom-pc</filename> variable.  
-                The meta <filename>SRCREV</filename> isn't specified in this file, so it must be 
-                specified in the base kernel recipe in the
-                <filename>poky/meta/recipes-kernel/linux/linux-yocto_3.0.bb</filename>
-                file, in the <filename>SRCREV_meta</filename>  variable found there.  
                 Here are the final <filename>SRCREV</filename> statements:
                 <literallayout class='monospaced'>
      SRCREV_machine_pn-linux-yocto_mymachine ?= \ 
-        "1e18e44adbe79b846e382370eb29bc4b8cd5a1a0"
+        "fce17f046d3756045e4dfb49221d1cf60fcae329"
      SRCREV_meta_pn-linux-yocto_mymachine ?= \ 
-        "d05450e4aef02c1b7137398ab3a9f8f96da74f52"
+        "84f1a422d7e21fbc23a687035bdf9d42471f19e0"
                 </literallayout>
             </para>
 
             <para>
-                In this example, we're using the <filename>SRCREV</filename> values we 
-                found already captured in the &DISTRO_NAME; release because we're creating a BSP based on 
-                &DISTRO_NAME;.  
-                If, instead, we had based our BSP on the master branches, we would want to use 
-                the most recent <filename>SRCREV</filename> values taken directly from the kernel repo.
-                We will not be doing that for this example.
-                However, if you do base a future BSP on master and
-                if you are familiar with Git repositories, you probably won’t have trouble locating the 
+                If you are familiar with Git repositories you probably won’t have trouble locating the 
                 exact commit strings in the Yocto Project source repositories you need to change 
                 the <filename>SRCREV</filename> statements.  
                 You can find all the <filename>machine</filename> and <filename>meta</filename> 
-                branch points (commits) for the <filename>linux-yocto-3.0-1.1.x</filename> kernel at
-                <ulink url='&YOCTO_GIT_URL;/cgit.cgi/linux-yocto-3.0-1.1.x/'></ulink>.  
+                branch points (commits) for the <filename>linux-yocto-3.0</filename> kernel 
+                <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/linux-yocto-2.6.37'>here</ulink>
+                [WRITER's NOTE:  Need new link to the 3.0 source repo area when it is available].  
             </para>
 
             <para>
@@ -513,25 +395,19 @@
                 Because we are not interested in supporting EMGD those three can be deleted.
                 The remaining three must be changed so that <filename>mymachine</filename> replaces
                 <filename>crownbay-noemgd</filename> and <filename>crownbay</filename>.
-                Because we are using the <filename>atom-pc</filename> branch for this new BSP, we can also find
-                the exact branch we need for the <filename>KMACHINE</filename> variable in our new BSP from the value
-                we find in the
-                <filename>poky/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend</filename>
-                file we looked at in a previous step.  
-                In this case, the value we want is in the <filename>KMACHINE_atom-pc</filename> variable in that file.
                 Here is the final <filename>linux-yocto_3.0.bbappend</filename> file after all 
                 the edits:
                 <literallayout class='monospaced'>
      FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
      COMPATIBLE_MACHINE_mymachine = "mymachine"
-     KMACHINE_mymachine  = "yocto/standard/common-pc/atom-pc"
+     KMACHINE_mymachine  = "yocto/standard/mymachine"
      KERNEL_FEATURES_append_mymachine += " cfg/smp.scc"
 
      SRCREV_machine_pn-linux-yocto_mymachine ?= \
-        "1e18e44adbe79b846e382370eb29bc4b8cd5a1a0"
+        "fce17f046d3756045e4dfb49221d1cf60fcae329"
      SRCREV_meta_pn-linux-yocto_mymachine ?= \
-        "d05450e4aef02c1b7137398ab3a9f8f96da74f52"
+        "84f1a422d7e21fbc23a687035bdf9d42471f19e0"
                 </literallayout>
             </para>
         </section>
@@ -545,7 +421,7 @@
             statements that do not support your targeted hardware in addition to the inclusion 
             of any new recipes you might need.  
             In this example, it was simply a matter of ridding the new layer 
-            <filename>meta-mymachine</filename> of any code that supported the EMGD features
+            <filename>meta-machine</filename> of any code that supported the EMGD features
             and making sure we were identifying the kernel that supports our example, which
             is the <filename>atom-pc-standard</filename> kernel.  
             We did not introduce any new recipes to the layer. 
@@ -580,7 +456,7 @@
                 Thus, entering the previous command created the <filename>yocto-build</filename> directory.  
                 If you do not provide a name for the build directory it defaults to 
                 <filename>build</filename>.  
-                The <filename>yocto-build</filename> directory contains a
+                The <filename>yocot-build</filename> directory contains a 
                 <filename>conf</filename> directory that has 
                 two configuration files you will need to check:  <filename>bblayers.conf</filename>
                 and <filename>local.conf</filename>.</para></listitem>
@@ -594,14 +470,14 @@
                 You should also be sure any other variables in which you are interested are set.  
                 Some variables to consider are <filename>BB_NUMBER_THREADS</filename>
                 and <filename>PARALLEL_MAKE</filename>, both of which can greatly reduce your build time 
-                if your development system supports multiple cores.
-                For development systems that support multiple cores, a good rule of thumb is to set 
-                both the <filename>BB_NUMBER_THREADS</filename> and <filename>PARALLEL_MAKE</filename> 
-                variables to twice the number of cores your system supports.</para></listitem>
+                if you are using a multi-threaded development system (e.g. values of 
+                <filename>8</filename> and <filename>j 6</filename>, respectively are optimal 
+                for a development machine that has four available cores).</para></listitem>
             <listitem><para>Update the <filename>bblayers.conf</filename> file so that it includes 
                 the path to your new BSP layer.  
-                In this example, you need to include this path as part of the 
-                <filename>BBLAYERS</filename> variable:
+                In this example you need to include the pathname to <filename>meta-mymachine</filename>.
+                For this example the 
+                <filename>BBLAYERS</filename> variable in the file would need to include the following path:
                 <literallayout class='monospaced'>
      $HOME/poky/meta-intel/meta-mymachine
                 </literallayout></para></listitem>
@@ -610,14 +486,14 @@
 
     <para>
         The appendix 
-        <ulink url='&YOCTO_DOCS_REF_URL;#ref-variables-glos'>
+        <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-variables-glos'>
         Reference: Variables Glossary</ulink> in the Yocto Project Reference Manual has more information 
          on configuration variables.
     </para>
 </section>
 
 <section id='building-the-image-app'>
-    <title>Building and Booting the Image</title>
+    <title>Building the Image</title>
 
     <para>
         To build the image for our <filename>meta-mymachine</filename> BSP enter the following command 
@@ -626,7 +502,7 @@
         For example, moving your working directory around could cause problems.  
         Here is the command for this example:
         <literallayout class='monospaced'>
-     $ bitbake -k core-image-sato
+     $ bitbake –k core-image-sato-live
         </literallayout>
     </para>
 
@@ -638,63 +514,6 @@
         If the build results in any type of error you should check for misspellings in the 
         files you changed or problems with your host development environment such as missing packages.
     </para>
-
-    <para>
-        Finally, once you have an image, you can try booting it from a device
-        (e.g. a USB device).
-        To prepare a bootable USB device, insert a USB flash drive into your build system and
-        copy the <filename>.hddimg</filename> file, located in the 
-        <filename>poky/build/tmp/deploy/images</filename>
-        directory after a successful build to the flash drive.  
-        Assuming the USB flash drive takes device <filename>/dev/sdc</filename>, 
-        use <filename>dd</filename> to copy the live image to it.  
-        For example:
-        <literallayout class='monospaced'>
-     # dd if=core-image-sato-mymachine-20120111232235.hddimg of=/dev/sdc
-     # sync
-     # eject /dev/sdc
-        </literallayout>
-        You should now have a bootable USB flash device.  
-    </para>
-
-    <para>
-        Insert the device
-        into a bootable USB socket on the target, and power it on.  
-        The system should boot to the Sato graphical desktop.
-        <footnote><para>Because 
-            this new image is not in any way tailored to the system you're
-            booting it on, which is assumed to be some sort of atom-pc (netbook) system for this
-            example, it might not be completely functional though it should at least boot to a text
-            prompt.  
-            Specifically, it might fail to boot into graphics without some tweaking.  
-            If this ends up being the case, a possible next step would be to replace the 
-            <filename>mymachine.conf</filename>
-            contents with the contents of <filename>atom-pc.conf</filename> and replace 
-            <filename>xorg.conf</filename> with <filename>atom-pc xorg.conf</filename>
-            in <filename>meta-yocto</filename> and see if it fares any better.  
-            In any case, following the previous steps will give you a buildable image that 
-            will probably boot on most systems.
-            Getting things working like you want
-            them to for your hardware will normally require some amount of experimentation with
-            configuration settings.</para></footnote> 
-    </para>
-
-    <para>
-        For reference, the sato image produced by the previous steps for &DISTRO_NAME; 
-        should look like the following in terms of size.
-        If your sato image is much different from this,
-        you probably made a mistake in one of the above steps:
-        <literallayout class='monospaced'>
-     358709248 2012-01-11 20:43 core-image-sato-mymachine-20120111232235.hddimg
-        </literallayout>
-        <note>The previous instructions are also present in the README that was copied
-        from meta-crownbay, which should also be updated to reflect the specifics of your
-        new BSP.  
-        That file and the <filename>README.hardware</filename> file in the top-level 
-        <filename>poky</filename> directory
-        also provides some suggestions for things to try if booting fails and produces
-        strange error messages.</note>
-    </para>
 </section>
 </appendix>
 

documentation/dev-manual/dev-manual-intro.xml

@@ -1,185 +1,182 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='dev-manual-intro'>
 
 <title>The Yocto Project Development Manual</title>
-    <section id='intro'>
-        <title>Introduction</title>
 
-        <para>
-            Welcome to the Yocto Project Development Manual!
-            This manual gives you an idea of how to use the Yocto Project to develop embedded Linux 
-            images and user-space applications to run on targeted devices. 
-            Reading this manual gives you an overview of image, kernel, and user-space application development
-            using the Yocto Project. 
-            Because much of the information in this manual is general, it contains many references to other
-            sources where you can find more detail.
-            For example, detailed information on Git, repositories and open source in general
-            can be found in many places.  
-            Another example is how to get set up to use the Yocto Project, which our 
-            <ulink url='&YOCTO_DOCS_QS_URL;'>Yocto Project Quick Start</ulink> covers.
-        </para>
+<para>
+    WRITER NOTE: The goal of this manual is to provide an over-arching development guide for using the Yocto Project.  
+    The intent is to give the reader the “big picture” around development.  
+    Much of the information in the manual will be detailed in other manuals.  
+    For example, detailed information on Git, repositories and open-source in general can be found in many places.  
+    Another example is getting set up to use the Yocto Project, which our Yocto Project Quick Start covers.  
+    However, this manual needs to at least address it.  
+    One might ask “What becomes of the Poky Reference Manual?”  
+    This manual, over time, needs to develop into a pure reference manual where all procedural information 
+    eventually ends up in an appropriate guide.   
+    A good example of information perfect for the Poky Reference Manual is the appendix on variable 
+    definitions (glossary).
+</para>
 
-        <para>  
-            The Yocto Project Development Manual, however, does provide detailed examples on how to create a 
-            Board Support Package (BSP), change the kernel source code, and re-configure the kernel.
-            You can find this information in the appendices of the manual.
-        </para>
-    </section>
+<section id='intro'>
+    <title>Introduction</title>
 
-    <section id='what-this-manual-provides'>
-        <title>What this Manual Provides</title>
+    <para>
+        Welcome to the Yocto Project Development Guide!  
+        This guide provides a general view of the development process using the Yocto Project.  
+        This guide is just that – a guide.  
+        It helps you understand the bigger picture involving development using the Yocto Project.  
+    </para>
+</section>
 
-        <para>
-            The following list describes what you can get from this guide:
-            <itemizedlist>
-                <listitem><para>Information that lets you get set 
-                    up to develop using the Yocto Project.</para></listitem>
-                <listitem><para>Information to help developers who are new to the open source environment 
-                    and to the distributed revision control system Git, which the Yocto Project 
-                    uses.</para></listitem>
-                <listitem><para>An understanding of common end-to-end development models and tasks.</para></listitem>
-                <listitem><para>Development case overviews for both system development and user-space 
-                    applications.</para></listitem>
-                <listitem><para>An overview and understanding of the emulation environment used with 
-                    the Yocto Project (QEMU).</para></listitem>
-<!--                <listitem><para>A discussion of target-level analysis techniques, tools, tips, 
-                    and tricks.</para></listitem>
-                <listitem><para>Considerations for deploying your final product.</para></listitem> -->
-                <listitem><para>An understanding of basic kernel architecture and 
-                    concepts.</para></listitem>
-<!--                <listitem><para>Information that will help you migrate an existing project to the 
-                    Yocto Project development environment.</para></listitem> -->
-                <listitem><para>Many references to other sources of related information.</para></listitem>
-            </itemizedlist>
-        </para>
-    </section>
+<section id='what-this-manual-provides'>
+    <title>What this Manual Provides</title>
 
-    <section id='what-this-manual-does-not-provide'>
-        <title>What this Manual Does Not Provide</title>
+    <para>
+        The following list describes what you can get from this guide:
+        <itemizedlist>
+            <listitem><para>Information that lets you get set 
+                up to develop using the Yocto Project.</para></listitem>
+            <listitem><para>Information to help developers that are new to the open source environment 
+                and to the distributed revision control system Git, which the Yocto Project 
+                uses.</para></listitem>
+            <listitem><para>An understanding of common end-to-end development models.</para></listitem>
+            <listitem><para>Development case overviews for both system development and user-space 
+                applications.</para></listitem>
+            <listitem><para>An overview and understanding of the emulation environment used with 
+                the Yocto Project (QEMU).</para></listitem>
+            <listitem><para>A discussion of target-level analysis techniques, tools, tips, 
+                and tricks.</para></listitem>
+            <listitem><para>Considerations for deploying your final product.</para></listitem>
+            <listitem><para>An understanding of basic kernel architecture and 
+                concepts.</para></listitem>
+            <listitem><para>Information that will help you migrate an existing project to the 
+                Yocto Project development environment.</para></listitem>
+            <listitem><para>Many references to other sources of related information.</para></listitem>
+        </itemizedlist>
+    </para>
+</section>
 
-        <para>
-            This manual will not give you the following:
-            <itemizedlist>
-                <listitem><para>Step-by-step instructions if those instructions exist in other Yocto 
-                    Project documentation.  
-                    For example, the 
-                    <ulink url='&YOCTO_DOCS_ADT_URL;'>Yocto Project Application Development Toolkit (ADT)
-                    User's Guide</ulink> contains detailed 
-                    instruction on how to obtain and configure the 
-                    <trademark class='trade'>Eclipse</trademark> Yocto Plug-in.</para></listitem>
-                <listitem><para>Reference material.  
-                    This type of material resides in an appropriate reference manual.  
-                    For example, system variables are documented in the 
-                    <ulink url='&YOCTO_DOCS_REF_URL;'>
-                    Yocto Project Reference Manual</ulink>.</para></listitem>
-                <listitem><para>Detailed public information that is not specific to the Yocto Project.  
-                    For example, exhaustive information on how to use Git is covered better through the 
-                    Internet than in this manual.</para></listitem>
-            </itemizedlist>
-        </para>
-    </section>
+<section id='what-this-manual-does-not-provide'>
+    <title>What this Manual Does Not Provide</title>
 
-    <section id='other-information'>
-        <title>Other Information</title>
+    <para>
+        This manual will not give you the following:
+        <itemizedlist>
+            <listitem><para>Step-by-step instructions if those instructions exist in other Yocto 
+                Project documentation.  
+                For example, The Application Development Toolkit (ADT) User’s Guide contains detailed 
+                instruction on how to obtain and configure the Eclipse Yocto Plug-in.</para></listitem>
+            <listitem><para>Reference material.  
+                This type of material resides in an appropriate reference manual.  
+                For example, system variables are documented in the Poky Reference Manual.</para></listitem>
+            <listitem><para>Detailed public information that is not specific to the Yocto Project.  
+                For example, exhaustive information on how to use Git is covered better through the 
+                Internet than in this manual.</para></listitem>
+        </itemizedlist>
+    </para>
+</section>
+
+<section id='other-information'>
+    <title>Other Information</title>
  
-        <para>
-            Because this manual presents overview information for many different topics, you will
-            need to supplement it with other information.
-            The following list presents other sources of information you might find helpful:
-            <itemizedlist>
-                <listitem><para><emphasis>The <ulink url='&YOCTO_HOME_URL;'>Yocto Project Website</ulink>:
-                    </emphasis> The home page for the Yocto Project provides lots of information on the project 
-                    as well as links to software and documentation.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&YOCTO_DOCS_QS_URL;'>
-                    The Yocto Project Quick Start</ulink>:</emphasis> This short document lets you get started 
-                    with the Yocto Project quickly and start building an image.</para></listitem>
-                <listitem><para><emphasis> 
-                    <ulink url='&YOCTO_DOCS_REF_URL;'>
-                    The Yocto Project Reference Manual</ulink>:</emphasis> This manual is a reference 
-                    guide to the Yocto Project build component known as "Poky."  
-                    The manual also contains a reference chapter on Board Support Package (BSP) 
-                    layout.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&YOCTO_DOCS_ADT_URL;'>
-                    The Yocto Project Application Development Toolkit (ADT) User's Guide</ulink>:</emphasis>
-                    This guide provides information that lets you get going with the ADT to 
-                    develop projects using the Yocto Project.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&YOCTO_DOCS_BSP_URL;'>
-                    The Yocto Project Board Support Package (BSP) Developer's Guide</ulink>:</emphasis>
-                    This guide defines the structure for BSP components.  
-                    Having a commonly understood structure encourages standardization.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&YOCTO_DOCS_KERNEL_URL;'>
-                    The Yocto Project Kernel Architecture and Use Manual</ulink>:</emphasis>
-                    This manual describes the architecture of the Yocto Project kernel and provides 
-                    some work flow examples.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='http://www.youtube.com/watch?v=3ZlOu-gLsh0'>
-                    Yocto Eclipse Plug-in</ulink>:</emphasis> A step-by-step instructional video that
-                    demonstrates how an application developer uses Yocto Plug-in features within 
-                    the Eclipse IDE.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&YOCTO_WIKI_URL;/wiki/FAQ'>FAQ</ulink>:</emphasis>
-                    A list of commonly asked questions and their answers.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&YOCTO_HOME_URL;/download/yocto/yocto-project-1.1.2-release-notes-poky-&POKYVERSION;'>
-                    Release Notes</ulink>:</emphasis> Features, updates and known issues for the current 
-                    release of the Yocto Project.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&YOCTO_BUGZILLA_URL;'>Bugzilla</ulink>:</emphasis>
-                    The bug tracking application the Yocto Project uses.
-                    If you find problems with the Yocto Project, you should report them using this
-                    application.</para></listitem>
-                <listitem><para><emphasis>
-                    Yocto Project Mailing Lists:</emphasis> To subscribe to the Yocto Project mailing 
-                    lists, click on the following URLs and follow the instructions:
-                    <itemizedlist>
-                        <listitem><para><ulink url='&YOCTO_LISTS_URL;/listinfo/yocto'></ulink> for a 
-                            Yocto Project Discussions mailing list.</para></listitem>
-                        <listitem><para><ulink url='&YOCTO_LISTS_URL;/listinfo/poky'></ulink> for a 
-                            Yocto Project Discussions mailing list about the Poky build system.</para></listitem>
-                        <listitem><para><ulink url='&YOCTO_LISTS_URL;/listinfo/yocto-announce'></ulink>
-                            for a mailing list to receive offical Yocto Project announcements for developments and 
-                            as well as Yocto Project milestones.</para></listitem>
-                    </itemizedlist></para></listitem>
-                <listitem><para><emphasis>Internet Relay Chat (IRC):</emphasis>
-                    Two IRC channels on freenode are available 
-                    for Yocto Project and Poky discussions: <filename>#yocto</filename> and 
-                    <filename>#poky</filename>.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&OH_HOME_URL;'>OpenedHand</ulink>:</emphasis>
-                    The company where the Yocto Project build system Poky was first developed.
-                    OpenedHand has since been acquired by Intel Corporation.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='http://www.intel.com/'>Intel Corporation</ulink>:</emphasis>
-                    The company that acquired OpenedHand in 2008 and continues development on the 
-                    Yocto Project.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='&OE_HOME_URL;'>OpenEmbedded</ulink>:</emphasis>
-                    The upstream, generic, embedded distribution the Yocto Project build system (Poky) derives
-                    from and to which it contributes.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='http://developer.berlios.de/projects/bitbake/'>
-                    BitBake</ulink>:</emphasis> The tool used to process Yocto Project metadata.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='http://bitbake.berlios.de/manual/'>
-                    BitBake User Manual</ulink>:</emphasis> A comprehensive guide to the BitBake tool.
-                    </para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='http://pimlico-project.org/'>Pimlico</ulink>:</emphasis>
-                    A suite of lightweight Personal Information Management (PIM) applications designed 
-                    primarily for handheld and mobile devices.</para></listitem>
-                <listitem><para><emphasis>
-                    <ulink url='http://wiki.qemu.org/Index.html'>QEMU</ulink>:
-                    </emphasis> An open-source machine emulator and virtualizer.</para></listitem>
-            </itemizedlist>
-        </para>
-    </section>   
+    <para>
+        Because this manual presents overview information for many different topics, you will
+        need to supplement it with other information.
+        The following list presents other sources of information you might find helpful:
+        <itemizedlist>
+            <listitem><para><emphasis>The <ulink url='http://www.yoctoproject.org'>Yocto Project Website</ulink>:
+                </emphasis> The home page for the Yocto Project provides lots of information on the project 
+                as well as links to software and documentation.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+                The Yocto Project Quick Start</ulink>:</emphasis> This short document lets you get started 
+                with the Yocto Project quickly and start building an image.</para></listitem>
+            <listitem><para><emphasis> 
+                <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+                The Yocto Project Reference Manual</ulink>:</emphasis> This manual is a reference 
+                guide to the Yocto Project build component known as "Poky."  
+                The manual also contains a reference chapter on Board Support Package (BSP) 
+                layout.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.yoctoproject.org/docs/1.1/adt-manual/adt-manual.html'>
+                The Yocto Project Application Development Toolkit (ADT) User's Guide</ulink>:</emphasis>
+                This guide provides information that lets you get going with the ADT to 
+                develop projects using the Yocto Project.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html'>
+                The Yocto Project Board Support Package (BSP) Developer's Guide</ulink>:</emphasis>
+                This guide defines the structure for BSP components.  
+                Having a commonly understood structure encourages standardization.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.yoctoproject.org/docs/1.1/kernel-manual/kernel-manual.html'>
+                The Yocto Project Kernel Architecture and Use Manual</ulink>:</emphasis>
+                This manual describes the architecture of the Yocto Project kernel and provides 
+                some work flow examples.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.youtube.com/watch?v=3ZlOu-gLsh0'>
+                Yocto Eclipse Plug-in</ulink>:</emphasis> A step-by-step instructional video that
+                demonstrates how an application developer uses Yocto Plug-in features within 
+                the Eclipse IDE.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://wiki.yoctoproject.org/wiki/FAQ'>FAQ</ulink>:</emphasis>
+                A list of commonly asked questions and their answers.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.yoctoproject.org/download/yocto/yocto-project-1.0-release-notes-poky-5.0'>
+                Release Notes</ulink>:</emphasis> Features, updates and known issues for the current 
+                release of the Yocto Project.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://bugzilla.yoctoproject.org/'>Bugzilla</ulink>:</emphasis>
+                The bug tracking application the Yocto Project uses.
+                If you find problems with the Yocto Project, you should report them using this
+                application.</para></listitem>
+            <listitem><para><emphasis>
+                Yocto Project Mailing Lists:</emphasis> To subscribe to the Yocto Project mailing 
+                lists, click on the following URLs and follow the instructions:
+                <itemizedlist>
+                    <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto'></ulink> for a 
+                        Yocto Discussions mailing list.</para></listitem>
+                    <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/poky'></ulink> for a 
+                        Yocto Project Discussions mailing list.</para></listitem>
+                    <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto-announce'></ulink>
+                        for a mailing list to receive offical Yocto Project announcements for developments and 
+                        as well as Yocto Project milestones.</para></listitem>
+                </itemizedlist></para></listitem>
+            <listitem><para><emphasis>Internet Relay Chat (IRC):</emphasis>
+                Two IRC channels on freenode are available 
+                for Yocto Project and Poky discussions: <filename>#yocto</filename> and 
+                <filename>#poky</filename>.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.openedhand.com/'>OpenedHand</ulink>:</emphasis>
+                The company where the Yocto Project build system Poky was first developed.
+                OpenedHand has since been acquired by Intel Corporation.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.intel.com/'>Intel Corporation</ulink>:</emphasis>
+                The company who acquired OpenedHand in 2008 and continues development on the 
+                Yocto Project.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://www.openembedded.org/'>OpenEmbedded</ulink>:</emphasis>
+                The upstream, generic, embedded distribution the Yocto Project build system (Poky) derives
+                from and to which it contributes.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://developer.berlios.de/projects/bitbake/'>
+                Bitbake</ulink>:</emphasis> The tool used to process Yocto Project metadata.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://bitbake.berlios.de/manual/'>
+                BitBake User Manual</ulink>:</emphasis> A comprehensive guide to the BitBake tool.
+                </para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://pimlico-project.org/'>Pimlico</ulink>:</emphasis>
+                A suite of lightweight Personal Information Management (PIM) applications designed 
+                primarily for handheld and mobile devices.</para></listitem>
+            <listitem><para><emphasis>
+                <ulink url='http://wiki.qemu.org/Index.html'>QEMU</ulink>:
+                </emphasis> An open source machine emulator and virtualizer.</para></listitem>
+        </itemizedlist>
+    </para>
+</section>
+            
 </chapter>
 <!--
 vim: expandtab tw=80 ts=4

documentation/dev-manual/dev-manual-kernel-appendix.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='dev-manual-kernel-appendix'>
 
@@ -48,7 +47,7 @@
                     <listitem><para>The <filename>poky-extras</filename> Git repository placed 
                         within the local Yocto Project files Git repository</para></listitem>  
                     <listitem><para>A bare clone of the Linux Yocto kernel upstream Git 
-                        repository to which you want to push your modifications.
+                        repository that you want to modify
                         </para></listitem>
                     <listitem><para>A copy of that bare clone in which you make your source 
                         modifcations</para></listitem>
@@ -57,16 +56,15 @@
 
             <para> 
                 The following figure summarizes these four areas.  
-                Within each rectangular that represents a data structure, a  
-                host development directory pathname appears at the 
+                Within each rectangular that represents a data structure an URL appears at the 
                 lower left-hand corner of the box.  
-                These pathnames are the locations used in this example.
+                These URLs are the locations used in this example.
                 The figure also provides key statements and commands used during the kernel
                 modification process:
             </para>
 
             <para>
-                <imagedata fileref="figures/kernel-example-repos-edison.png" width="7in" depth="5in" 
+                <imagedata fileref="figures/kernel-example-repos.png" width="7in" depth="5in" 
                     align="center" scale="100" />
             </para>
 
@@ -76,13 +74,13 @@
                     <listitem><para><emphasis>Local Yocto Project Files Git Repository:</emphasis> 
                         This area contains all the metadata that supports building images in the 
                         Yocto Project build environment - the local Yocto Project files.
-                        In this example, the local Yocto Project files Git repository also 
-                        contains the build directory, which contains the configuration directory 
-                        that lets you control the build.
-                        In this example, the repository also contains the 
+                        The Local Yocto Project files Git repository also contains the build directory
+                        and a configuration directory that let you control the build.
+                        Note also that in this example the repository also contains the 
                         <filename>poky-extras</filename> Git repository.</para>
                         <para>See the bulleted item
-                        "<link linkend='local-yp-release'>Yocto Project Release</link>"
+                        <link linkend='local-yp-release'>Yocto Project Release</link> in
+                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
                         for information on how to get these files.</para></listitem>
                     <listitem><para><emphasis><filename>poky-extras</filename> Git Repository:</emphasis> 
                         This area contains the <filename>meta-kernel-dev</filename> layer, 
@@ -93,8 +91,9 @@
                         (or really any) kernel recipes that faciliate the creation and development
                         of kernel features, BSPs or configurations.</para>
                         <para>See the bulleted item
-                        "<link linkend='poky-extras-repo'>The 
-                        <filename>poky-extras</filename> Git Repository</link>" 
+                        <link linkend='poky-extras-repo'>The 
+                        <filename>poky-extras</filename> Git Repository</link> in
+                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
                         for information on how to get these files.</para></listitem>                
                     <listitem><para><emphasis>Bare Clone of the Linux Yocto kernel:</emphasis> 
                         This bare Git repository tracks the upstream Git repository of the Linux 
@@ -106,7 +105,8 @@
                         <filename>poky-extras</filename> repository points to the bare clone
                         so that the build process can locate the locally changed source files.</para>
                         <para>See the bulleted item
-                        "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>"
+                        <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in  
+                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
                         for information on how to set up the bare clone.
                         </para></listitem>
                     <listitem><para><emphasis>Copy of the Linux Yocto Kernel Bare Clone:</emphasis>
@@ -114,14 +114,9 @@
                         Any changes you make to files in this location need to ultimately be pushed
                         to the bare clone using the <filename>git push</filename> command.</para>
                         <para>See the bulleted item
-                        "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>"
+                        <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in  
+                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
                         for information on how to set up the bare clone.
-                        <note>Typically, Git workflows follow a scheme where changes made to a local area 
-                        are pulled into a Git repository.
-                        However, because the <filename>git pull</filename> command does not work 
-                        with bare clones, this workflow pushes changes to the 
-                        repository even though you could use other more complicated methods to
-                        get changes into the bare clone.</note>
                         </para></listitem>
                 </itemizedlist>
             </para>
@@ -136,7 +131,8 @@
                 This example uses <filename>poky</filename> as the root directory of the 
                 local Yocto Project files Git repository.
                 See the bulleted item
-                "<link linkend='local-yp-release'>Yocto Project Release</link>"
+                <link linkend='local-yp-release'>Yocto Project Release</link> in
+                <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
                 for information on how to get these files.
             </para>
 
@@ -150,14 +146,14 @@
      $ git branch -a
      $ git tag -l
                 </literallayout> 
-                This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;", 
-                which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. 
-                The following commands create and checkout the local <filename>&DISTRO_NAME;</filename>
+                This example uses the Yocto Project 1.1_M3 Release, 
+                which maps to the <filename>1.1_M3</filename> branch in the repository. 
+                The following commands create and checkout the local <filename>1.1_M3</filename>
                 branch:
                 <literallayout class='monospaced'>
-     $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
-     Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
-     Switched to a new branch '&DISTRO_NAME;'
+     $ git checkout -b 1.1_M3 origin/1.1_M3
+     Branch 1.1_M3 set up to track remote branch 1.1_M3 from origin.
+     Switched to a new branch '1.1_M3'
                 </literallayout>
             </para>
         </section>
@@ -169,42 +165,23 @@
                 This example places the <filename>poky-extras</filename> Git repository inside
                 of <filename>poky</filename>.
                 See the bulleted item
-                "<link linkend='poky-extras-repo'>The 
-                <filename>poky-extras</filename> Git Repository</link>" 
+                <link linkend='poky-extras-repo'>The 
+                <filename>poky-extras</filename> Git Repository</link> in
+                <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
                 for information on how to get the <filename>poky-extras</filename> repository.
             </para>
-
-            <para>
-                Once you have the repository set up, 
-                you have many development branches from which you can work. 
-                From inside the repository you can see the branch names and the tag names used 
-                in the Git repository using either of the following two commands:
-                <literallayout class='monospaced'>
-     $ cd poky/poky-extras
-     $ git branch -a
-     $ git tag -l
-                </literallayout> 
-                This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;", 
-                which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. 
-                The following commands create and checkout the local <filename>&DISTRO_NAME;</filename>
-                branch:
-                <literallayout class='monospaced'>
-     $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
-     Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
-     Switched to a new branch '&DISTRO_NAME;'
-                </literallayout>
-            </para>
         </section>
 
         <section id='setting-up-the-bare-clone-and-its-copy'>
             <title>Setting Up the Bare Clone and its Copy</title>
 
             <para>
-                This example modifies the <filename>linux-yocto-3.0-1.1.x</filename> kernel.
+                This example modifies the <filename>linux-yocto-3.0</filename> kernel.
                 Thus, you need to create a bare clone of that kernel and then make a copy of the 
                 bare clone.
                 See the bulleted item
-                "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>" 
+                <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in  
+                <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual
                 for information on how to do that.
             </para>
 
@@ -212,16 +189,14 @@
                 The bare clone exists for the kernel build tools and simply as the receiving end 
                 of <filename>git push</filename>
                 commands after you make edits and commits inside the copy of the clone.
-                The copy (<filename>my-linux-yocto-3.0-1.1.x-work</filename> in this example) has to have 
+                The copy (<filename>linux-yocto-3.0</filename> in this example) has to have 
                 a local branch created and checked out for your work.
                 This example uses <filename>common-pc-base</filename> as the local branch.
                 The following commands create and checkout the branch:
                 <literallayout class='monospaced'>
-     $ cd ~/my-linux-yocto-3.0-1.1.x-work
+     $ cd ~/linux-yocto-3.0
      $ git checkout -b common-pc-base origin/yocto/standard/common-pc/base
-     Checking out files: 100% (7289/7289), done.
-     Branch common-pc-base set up to track remote branch 
-        yocto/standard/common-pc/base from origin.
+     Branch common-pc-base set up to track remote branch yocto/standard/common-pc/base from origin.
      Switched to a new branch 'common-pc-base'
                 </literallayout>
             </para>
@@ -245,13 +220,11 @@
                     If your host development system supports multi-core and multi-thread capabilities,
                     you can uncomment these statements and set the variables to significantly shorten
                     the full build time.
-                    As a guideline, set both <filename>BB_NUMBER_THREADS</filename> and 
-                    <filename>PARALLEL_MAKE</filename> to twice the number 
-                    of cores your machine supports.
+                    As a guideline, set <filename>BB_NUMBER_THREADS</filename> to twice the number 
+                    of cores your machine supports and set <filename>PARALLEL_MAKE</filename> to one and 
+                    a half times the number of cores your machine supports.
                 </note>
-                The following two commands <filename>source</filename> the build environment setup script
-                and build the default <filename>qemux86</filename> image.
-                If necessary, the script creates the build directory:
+                The following commands build the default <filename>qemux86</filename> image:
                 <literallayout class='monospaced'>
      $ cd ~/poky
      $ source oe-init-build-env
@@ -269,14 +242,15 @@
          meta-ide-support
 
      You can also run generated qemu images with a command like 'runqemu qemux86'
+
+     $ bitbake -k core-image-minimal
                 </literallayout>
             </para>
 
             <para>
-                The following <filename>bitbake</filename> command starts the build:
-                <literallayout class='monospaced'>
-     $ bitbake -k core-image-minimal
-                </literallayout>
+                The <filename>source</filename> command sets up the build environment and, 
+                if necessary, creates the build directory.
+                The following <filename>bitbake</filename> command starts the build.
                 <note>Be sure to check the settings in the <filename>local.conf</filename>
                 before starting the build.</note>
             </para>
@@ -313,7 +287,7 @@
 
             <para>
                 The file you change in this example is named <filename>calibrate.c</filename>
-                and is located in the <filename>my-linux-yocto-3.0-1.1.x-work</filename> Git repository
+                and is located in the <filename>linux-yocto-3.0</filename> Git repository
                 (the copy of the bare clone) in <filename>init</filename>.
                 This example simply inserts several <filename>printk</filename> statements
                 at the beginning of the <filename>calibrate_delay</filename> function.
@@ -324,7 +298,8 @@
                 <literallayout class='monospaced'>
      void __cpuinit calibrate_delay(void)
      {
-	     unsigned long lpj;
+	     unsigned long ticks, loopbit;
+	     int lps_precision = LPS_PREC;
 	     static bool printed;
 
          if (preset_lpj) {
@@ -340,7 +315,8 @@
                 <literallayout class='monospaced'>
      void __cpuinit calibrate_delay(void)
      {
-	     unsigned long lpj;
+	     unsigned long ticks, loopbit;
+	     int lps_precision = LPS_PREC;
 	     static bool printed;
          printk("*************************************\n");
          printk("*                                   *\n");
@@ -398,24 +374,24 @@
                change the target architecture of the machine you are building or you move
                the bare clone, copy of the clone, or the <filename>poky-extras</filename> repository:
                <itemizedlist>
-                   <listitem><para><emphasis>Build for the Correct Target Architecture:</emphasis> The 
+                   <listitem><para><emphasis>Build for the Correct Target Architecture</emphasis> - The 
                        <filename>local.conf</filename> file in the build directory defines the build's 
                        target architecture.
                        By default, <filename>MACHINE</filename> is set to 
-                       <filename>qemux86</filename>, which specifies a 32-bit 
-                       <trademark class='registered'>Intel</trademark> Architecture 
+                       <filename>qemux86</filename>, which specifies a 32-bit Intel Architecture 
                        target machine suitable for the QEMU emulator.  
                        In this example, <filename>MACHINE</filename> is correctly configured.
                        </para></listitem>
-                   <listitem><para><emphasis>Optimize Build Time:</emphasis> Also in the 
+                   <listitem><para><emphasis>Optimize Build Time</emphasis> - Also in the 
                        <filename>local.conf</filename> file are two variables that can speed your 
                        build time if your host supports multi-core and multi-thread capabilities:
                        <filename>BB_NUMBER_THREADS</filename> and <filename>PARALLEL_MAKE</filename>.
                        If the host system has multiple cores then you can optimize build time 
-                       by setting both these variables to twice the number of 
-                       cores.</para></listitem>
+                       by setting <filename>BB_NUMBER_THREADS</filename> to twice the number of 
+                       cores and setting <filename>PARALLEL_MAKE</filename> to one and a half times the 
+                       number of cores.</para></listitem>
                    <listitem><para><emphasis>Identify Your <filename>meta-kernel-dev</filename>
-                       Layer:</emphasis> The <filename>BBLAYERS</filename> variable in the 
+                       Layer</emphasis> - The <filename>BBLAYERS</filename> variable in the 
                        <filename>bblayers.conf</filename> file found in the 
                        <filename>poky/build/conf</filename> directory needs to have the path to your local
                        <filename>meta-kernel-dev</filename> layer.  
@@ -432,20 +408,20 @@
        /home/scottrif/poky/poky-extras/meta-kernel-dev \
        "
                        </literallayout></para></listitem>
-                   <listitem><para><emphasis>Identify Your Source Files:</emphasis> In the 
+                   <listitem><para><emphasis>Identify Your Source Files</emphasis> - In the 
                        <filename>linux-yocto_3.0.bbappend</filename> file located in the 
                        <filename>poky-extras/meta-kernel-dev/recipes-kernel/linux</filename>
                        directory, you need to identify the location of the 
                        local source code, which in this example is the bare clone named
-                       <filename>linux-yocto-3.0-1.1.x.git</filename>.
+                       <filename>linux-yocto-3.0.git</filename>.
                        To do this, set the <filename>KSRC_linux_yocto</filename> variable to point to your
-                       local <filename>linux-yocto-3.0-1.1.x.git</filename> Git repository by adding the 
+                       local <filename>linux-yocto-3.0.git</filename> Git repository by adding the 
                        following statement.
                        Be sure to substitute your user information in the statement:
                        <literallayout class='monospaced'>
-     KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0-1.1.x.git
+     KSRC_linux_yocto ?= /home/scottrif/linux-yocto-3.0.git
                        </literallayout></para></listitem>
-                   <listitem><para><emphasis>Specify the Kernel Machine:</emphasis> Also in the 
+                   <listitem><para><emphasis>Specify the Kernel Machine</emphasis> - Also in the 
                        <filename>linux-yocto_3.0.bbappend</filename> file, you need to specify
                        the kernel machine with the following statement:
                        <literallayout class='monospaced'>
@@ -455,19 +431,14 @@
            </para>
 
            <note>
-               <para>Before attempting to build the modified kernel, there is one more set of changes you 
+               Before attempting to build the modified kernel, there is one more set of changes you 
                need to make in the <filename>meta-kernel-dev</filename> layer.
                Because all the kernel <filename>.bbappend</filename> files are parsed during the 
                build process regardless of whether you are using them or not, you should either 
                comment out the <filename>COMPATIBLE_MACHINE</filename> statements in all 
-               unused <filename>.bbappend</filename> files, or simply remove (or rename) all the files 
+               <filename>.bbappend</filename> files, or you should simply remove all the files 
                except the one your are using for the build 
-               (i.e. <filename>linux-yocto_3.0.bbappend</filename> in this example).</para>
-               <para>If you do not make one of these two adjustments, your machine will be compatible
-               with all the kernel recipes in the <filename>meta-kernel-dev</filename> layer. 
-               When your machine is comapatible with all the kernel recipes, the build attempts
-               to build all kernels in the layer.
-               You could end up with build errors blocking your work.</para>
+               (i.e. <filename>linux-yocto_3.0.bbappend</filename> in this example).
            </note>            
        </section>
 
@@ -480,33 +451,31 @@
                 <orderedlist>
                     <listitem><para>Your environment should be set up since you previously sourced
                         the <filename>oe-init-build-env</filename> script.
-                        If it isn't, source the script again from <filename>poky</filename>.
-                        <literallayout class='monospaced'>
-     $ cd ~/poky
-     $ source oe-init-build-env
-                        </literallayout>
+                        If it isn't, source the script again from <filename>poky</filename>
                         </para></listitem>
                     <listitem><para>Be sure old images are cleaned out by running the 
-                        <filename>cleanall</filename> BitBake task as follows from your build directory:
+                        <filename>cleanall</filename> BitBake task as follows:
                         <literallayout class='monospaced'>
      $ bitbake -c cleanall linux-yocto
                         </literallayout></para>
-                        <para><note>Never remove any files by hand from the <filename>tmp/deploy</filename>
+                        <para><note>Never remove by hand any files from the <filename>tmp/deploy</filename>
                         directory insided the local Yocto Project files build directory.
                         Always use the BitBake <filename>cleanall</filename> task to clear
                         out previous builds.</note></para></listitem>
-                    <listitem><para>Next, build the kernel image using this command:
+                    <listitem><para>Build the kernel image using this command:
                         <literallayout class='monospaced'>
      $ bitbake -k core-image-minimal
                         </literallayout></para></listitem>
-                    <listitem><para>Finally, boot the modified image in the QEMU emulator 
-                        using this command:
-                        <literallayout class='monospaced'>
-     $ runqemu qemux86
-                        </literallayout></para></listitem>
                 </orderedlist>
             </para>
 
+            <para>
+                Finally, boot the modified image in the QEMU emulator using this command:
+                <literallayout class='monospaced'>
+     $ runqemu qemux86
+                </literallayout>
+            </para>
+
             <para>
                 Log into the machine using <filename>root</filename> with no password and then 
                 use the following shell command to scroll through the console's boot output.
@@ -526,8 +495,8 @@
         <title>Changing the Kernel Configuration</title>
 
         <para>
-            This example changes the default behavior, which is "off", of the Symmetric 
-            Multi-processing Support (<filename>CONFIG_SMP</filename>) to "on".  
+            This example changes the default behavior (off) of the Symmetric Multi-processing Support 
+            (<filename>CONFIG_SMP</filename>) to on.  
             It is a simple example that demonstrates how to reconfigure the kernel.
         </para>
 
@@ -536,108 +505,45 @@
 
             <para>
                 If you took the time to work through the example that modifies the kernel source code 
-                in "<link linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source
-                Code</link>" you should already have the Yocto Project files set up on your 
-                host machine.
-                If this is the case, go to the next section, which is titled
-                "<link linkend='examining-the-default-config-smp-behavior'>Examining the Default
-                <filename>CONFIG_SMP</filename> Behavior</link>", and continue with the 
-                example.
-            </para>
-
-            <para>
-                If you don't have the Yocto Project files established on your system, 
-                you can get them through tarball extraction or by 
-                cloning the <filename>poky</filename> Git repository.  
-                This example uses <filename>poky</filename> as the root directory of the 
-                local Yocto Project files Git repository.
-                See the bulleted item
-                "<link linkend='local-yp-release'>Yocto Project Release</link>"
-                for information on how to get these files.
-            </para>
-
-            <para>
-                Once you have the repository set up, 
-                you have many development branches from which you can work. 
-                From inside the repository you can see the branch names and the tag names used 
-                in the Git repository using either of the following two commands:
-                <literallayout class='monospaced'>
-     $ cd poky
-     $ git branch -a
-     $ git tag -l
-                </literallayout> 
-                This example uses the Yocto Project &DISTRO; Release code named "&DISTRO_NAME;", 
-                which maps to the <filename>&DISTRO_NAME;</filename> branch in the repository. 
-                The following commands create and checkout the local <filename>&DISTRO_NAME;</filename>
-                branch:
-                <literallayout class='monospaced'>
-     $ git checkout -b &DISTRO_NAME; origin/&DISTRO_NAME;
-     Branch &DISTRO_NAME; set up to track remote branch &DISTRO_NAME; from origin.
-     Switched to a new branch '&DISTRO_NAME;'
-                </literallayout>
-            </para>
-
-            <para>
-                Next, you need to build the default <filename>qemux86</filename> image that you 
-                can boot using QEMU.
-                <note>
-                    Because a full build can take hours, you should check two variables in the 
-                    <filename>build</filename> directory that is created after you source the 
-                    <filename>oe-init-build-env</filename> script.
-                    You can find these variables
-                    <filename>BB_NUMBER_THREADS</filename> and <filename>PARALLEL_MAKE</filename>
-                    in the <filename>build/conf</filename> directory in the 
-                    <filename>local.conf</filename> configuration file.
-                    By default, these variables are commented out.
-                    If your host development system supports multi-core and multi-thread capabilities,
-                    you can uncomment these statements and set the variables to significantly shorten
-                    the full build time.
-                    As a guideline, set <filename>BB_NUMBER_THREADS</filename> to twice the number 
-                    of cores your machine supports and set <filename>PARALLEL_MAKE</filename> to one and 
-                    a half times the number of cores your machine supports.
-                </note>
-                The following two commands <filename>source</filename> the build environment setup script
-                and build the default <filename>qemux86</filename> image.
-                If necessary, the script creates the build directory:
-                <literallayout class='monospaced'>
-     $ cd ~/poky
-     $ source oe-init-build-env
-
-          ### Shell environment set up for builds. ###
-
-     You can now run 'bitbake &lt;target&gt;'
-
-     Common targets are:
-         core-image-minimal
-         core-image-sato
-         meta-toolchain
-         meta-toolchain-sdk
-         adt-installer
-         meta-ide-support
-
-     You can also run generated qemu images with a command like 'runqemu qemux86'
-                </literallayout>
-            </para>
-
-            <para>
-                The following <filename>bitbake</filename> command starts the build:
-                <literallayout class='monospaced'>
-     $ bitbake -k core-image-minimal
-                </literallayout>
-                <note>Be sure to check the settings in the <filename>local.conf</filename>
-                before starting the build.</note>
+                in <xref linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source
+                Code</xref> you are set up to quickly work through this example.
+                If not, then work through the following list to prepare:
+                <itemizedlist>
+                    <listitem><para><emphasis>Understand the development environment:</emphasis>
+                        See <xref linkend='understanding-the-files-you-need'> 
+                        Understanding the Files You Need</xref> for information.</para></listitem>
+                    <listitem><para><emphasis>Set up the local Yocto Project files Git 
+                        repository:</emphasis>
+                        See <xref linkend='setting-up-the-local-yocto-project-files-git-repository'>
+                        Setting Up the Local Yocto Project Files Git Repository</xref> for 
+                        information.</para></listitem>
+                    <listitem><para><emphasis>Set up the <filename>poky-extras</filename> Git 
+                        repository:</emphasis>
+                        See <xref linkend='setting-up-the-poky-extras-git-repository'>
+                        Setting Up <filename>poky-extras</filename> Git repository</xref> for
+                        information.</para></listitem>
+                    <listitem><para><emphasis>Set up the the bare clone and its copy:</emphasis>
+                        See <xref linkend='setting-up-the-bare-clone-and-its-copy'>
+                        Setting Up the Bare Clone and its Copy</xref> for information.
+                        </para></listitem>
+                    <listitem><para><emphasis>Build the default QEMU kernel image:</emphasis>
+                        See <xref linkend='building-and-booting-the-default-qemu-kernel-image'>
+                        Building and Booting the Default QEMU Kernel image</xref> 
+                        for information.
+                        Do not boot the image in the QEMU emulator at this point.</para></listitem>
+                </itemizedlist>
             </para>
         </section>
 
         <section id='examining-the-default-config-smp-behavior'>
-            <title>Examining the Default&nbsp;&nbsp;<filename>CONFIG_SMP</filename> Behavior</title>
+            <title>Examining the Default <filename>CONFIG_SMP</filename> Behavior</title>
 
             <para>
                 By default, <filename>CONFIG_SMP</filename> supports single processor machines.
-                To see this default setting from within the QEMU emulator, boot your image using 
+                To see this default setting from within the QEMU emulator boot your image using 
                 the emulator as follows:
                 <literallayout class='monospaced'>
-     $ runqemu qemux86 qemuparams="-smp 2"
+     $ runqemu qemux86
                 </literallayout>
             </para>
 
@@ -651,20 +557,16 @@
      processor       : 0
      #
                 </literallayout>
-                Logout of the emulator using the <filename>exit</filename> command and 
-                then close it down.
             </para>
         </section>
 
-
-
         <section id='changing-the-config-smp-configuration-using-menuconfig'>
-            <title>Changing the&nbsp;&nbsp;<filename>CONFIG_SMP</filename> Configuration Using&nbsp;&nbsp;<filename>menuconfig</filename></title>
+            <title>Changing the <filename>CONFIG_SMP</filename> Configuration Using <filename>menuconfig</filename></title>
 
             <para>
                 The <filename>menuconfig</filename> tool provides an interactive method with which
                 to set kernel configurations.
-                You need to run <filename>menuconfig</filename> inside the Yocto BitBake environment.
+                You need to run <filename>menuconfig</filename> inside the BitBake environment.
                 Thus, the environment must be set up using the <filename>oe-init-build-env</filename>
                 script found in the Yocto Project files Git repository build directory.
                 If you have not sourced this script do so with the following commands:
@@ -677,24 +579,15 @@
             <para>
                 After setting up the environment to run <filename>menuconfig</filename>, you are ready 
                 to use the tool to interactively change the kernel configuration.
-                In this example, we are basing our changes on the <filename>linux-yocto-3.0-1.1.x</filename>
+                In this example we are basing our changes on the <filename>linux-yocto-3.0</filename>
                 kernel.
                 The Yocto Project build environment recognizes this kernel as 
                 <filename>linux-yocto</filename>.
-                Thus, the following commands from the shell in which you previously sourced the 
-                environment initialization script cleans the shared state memory and 
-                the <filename>WORKDIR</filename> direcotry and then builds and 
-                launches <filename>menuconfig</filename>:
+                Thus, the following command from the shell in which you previously sourced the 
+                environment initialization script launches <filename>menuconfig</filename>:
                 <literallayout class='monospaced'>
-     $ bitbake linux-yocto -c cleansstate
      $ bitbake linux-yocto -c menuconfig
                 </literallayout>
-                <note>Due to a bug in the release, it is necessary to clean the shared state
-                    memory in order for configurations made using <filename>menuconfig</filename>
-                    to take effect.
-                    For information on the bug, see 
-                    <ulink url='&YOCTO_BUGZILLA_URL;/show_bug.cgi?id=2256'></ulink>.
-                </note>
             </para>
                   
             <para>
@@ -703,32 +596,23 @@
                 You can find it at <filename>Processor Type and Features</filename>.
                 The configuration selection is 
                 <filename>Symmetric Multi-processing Support</filename>.
-                After using the arrow keys to highlight this selection, press "y" to select it.
-                Then, exit out and save your selections.
             </para>
 
             <para>
-                Once you save the selection, the <filename>.config</filename> configuration file
+                Once you save the selection the <filename>.config</filename> configuration file
                 is updated. 
                 This is the file that the build system uses to configure the Linux Yocto kernel
                 when it is built. 
-                You can find and examine this file in the Yocto Project Files Git repository in 
+                You can find and examine this file in the Yocto Project files Git repository in 
                 the build directory. 
                 This example uses the following:
                 <literallayout class='monospaced'>
-     ~/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-3.0.10+git1+d38...
-        ...3a9ac596f7a-r3/linux-qemux86-standard-build
+     ~/poky/build/tmp/work/qemux86-poky-linux/linux-yocto-2.6.37+git1+84f...r20/linux-qemux86-standard-build
                 </literallayout>
-                <note>
-                    The previous example directory is artificially split and many of the characters 
-                    in the actual filename are omitted in order to make it more readable.
-                    Also, depending on the kernel you are using, the exact pathname might differ 
-                    slightly.
-                </note>
             </para>
 
             <para>
-                Within the <filename>.config</filename> file, you can see the following setting:
+                Within the <filename>.config</filename> you can see the following setting:
                 <literallayout class='monospaced'>
      CONFIG_SMP=y
                 </literallayout>
@@ -737,19 +621,13 @@
             <para>
                 A good method to isolate changed configurations is to use a combination of the 
                 <filename>menuconfig</filename> tool and simple shell commands.
-                Before changing configurations with <filename>menuconfig</filename>, copy the 
-                existing <filename>.config</filename> and rename it to something else,
-                use <filename>menuconfig</filename> to make 
+                Before changing configurations with <filename>menuconfig</filename> simply rename
+                the default <filename>.config</filename>, use <filename>menuconfig</filename> to make 
                 as many changes an you want and save them, then compare the renamed configuration 
                 file against the newly created file.
                 You can use the resulting differences as your base to create configuration fragments
                 to permanently save in your kernel layer.
-                <note>
-                    Be sure to make a copy of the <filename>.config</filename> and don't just
-                    rename it. 
-                    The Yocto Project build system needs an existing <filename>.config</filename>
-                    from which to work.
-                </note>
+                For an example of this procedure, see [WRITER'S NOTE: need forwarding link to section].
             </para>
         </section>
 
@@ -757,7 +635,7 @@
             <title>Recompiling the Kernel and Testing the New Configuration</title>
 
             <para>
-                At this point, you are ready to recompile your kernel image with 
+                At this point you are ready to recompile your kernel image with 
                 the new setting in effect using the BitBake commands below:
                 <literallayout class='monospaced'>
      $ bitbake linux-yocto -c compile -f
@@ -768,7 +646,7 @@
             <para>
                 Now run the QEMU emulator:
                 <literallayout class='monospaced'>
-     $ runqemu qemux86 qemuparams="-smp 2"
+     $ runqemu qemux86
                 </literallayout>
             </para>
 
@@ -784,7 +662,7 @@
             </para>
 
             <para>
-                From the output, you can see that you have successfully reconfigured the kernel.
+                From the output you can see that you have successfully reconfigured the kernel.
             </para>
         </section>
     </section>
@@ -793,14 +671,13 @@
         <title>Adding Kernel Recipes</title>
 
         <para>
-            A future release of this manual will present an example that adds kernel recipes, which provide 
+            This section presents an example that adds kernel recipes, which provide 
             new functionality to the kernel.
         </para>
 
         <para>
-            <imagedata fileref="figures/wip.png" 
-                width="2in" depth="3in" align="center" scalefit="1" />
-        </para> 
+            [Example to be supplied]
+        </para>
     </section> 
 
 

documentation/dev-manual/dev-manual-model.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='dev-manual-model'>
 
@@ -10,22 +9,16 @@
     Many development models exist for which you can use the Yocto Project. 
     However, for the purposes of this manual we are going to focus on two common ones:  
     System Development and User Application Development.  
-    System Development covers Board Support Package (BSP) development and kernel modification
-    or configuration.  
+    System Development covers Board Support Package (BSP) development and kernel modification.  
     User Application Development covers development of applications that you intend to run on some 
     target hardware.  
 </para>
 
 <para>
     This chapter presents overviews of both system and application models.
-    If you want to examine specific examples of the system development models, 
-    see the "<link linkend='dev-manual-bsp-appendix'>BSP Development Example</link>" 
-    appendix and the 
-    "<link linkend='dev-manual-kernel-appendix'>Kernel Modification Example</link>" appendix.
-    For a user-space application development example that uses the 
-    <trademark class='trade'>Eclipse</trademark> IDE,
-    see <ulink url='&YOCTO_DOCS_ADT_URL;'>The Yocto Project Application Development 
-    Toolkit (ADT) User's Guide</ulink>.
+    If you want to reference specific examples of these development models, 
+    see <xref linkend='dev-manual-bsp-appendix'>BSP Development Example</xref> and 
+    <xref linkend='dev-manual-kernel-appendix'>Kernel Modification Example</xref>.
 </para>
 
 <section id='system-development-model'>
@@ -34,41 +27,41 @@
     <para>
         System development involves modification or creation of an image that you want to run on 
         a specific hardware target.  
-        Usually, when you want to create an image that runs on embedded hardware, the image does 
-        not require the same number of features that a full-fledged Linux distribution provides.
-        Thus, you can create a much smaller image that is designed to use only the hardware
+        Usually when you want to create an image that runs on embedded hardware the image does 
+        not require the same amount of features that a full-fledged Linux distribution provides.  
+        Thus, you can create a much smaller image that is designed to just use the hardware 
         features for your particular hardware.
     </para>
 
     <para>
         To help you understand how system development works in the Yocto Project, this section 
-        covers two types of image development:  BSP creation and kernel modification or 
-        configuration.
+        covers two types of image development:  BSP creation and kernel modification
+        (see <xref linkend='kernel-spot'></xref>).
     </para>
 
     <section id='developing-a-board-support-package-bsp'>
         <title>Developing a Board Support Package (BSP)</title>
 
         <para>
-            A BSP is a packageof recipes that, when applied, during a build results in 
-            an image that you can run on a particular board.  
+            A BSP is a package of recipes that when applied during a build results in 
+            an image you can run on a particular board.  
             Thus, the package, when compiled into the new image, supports the operation of the board.  
         </para>
 
         <note>
             For a brief list of terms used when describing the development process in the Yocto Project, 
-            see the "<link linkend='yocto-project-terms'>Yocto Project Terms</link>" section.
+            see <xref linkend='yocto-project-terms'>Yocto Project Terms</xref> in this manual.
         </note>
 
         <para>
-            The remainder of this section presents the basic steps used to create a BSP 
-            based on an existing BSP that ships with the Yocto Project.
-            You can reference the "<link linkend='dev-manual-bsp-appendix'>BSP Development Example</link>"
-            appendix for a detailed example that uses the Crown Bay BSP as a base BSP from which to start.
+            The remainder of this section presents the basic steps to create a BSP basing it on an 
+            existing BSP that ships with the Yocto Project.
+            You can reference <xref linkend='dev-manual-bsp-appendix'>BSP Development Example</xref>
+            for a detailed example that uses the Crown Bay BSP as a base BSP from which to start.
         </para>
 
         <para>
-            The following illustration and list summarize the BSP creation general workflow.
+            This illustration and the following list summarizes the BSP creation general workflow.
         </para>
 
         <para>
@@ -78,79 +71,75 @@
         <para>
             <orderedlist>
                 <listitem><para><emphasis>Set up your host development system to support 
-                    development using the Yocto Project</emphasis>:  See the
-                    "<ulink url='&YOCTO_DOCS_QS_URL;#the-linux-distro'>The Linux Distributions</ulink>" 
-                    and the 
-                    "<ulink url='&YOCTO_DOCS_QS_URL;#packages'>The Packages</ulink>" sections both
+                    development using the Yocto Project</emphasis>:  See  
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#the-linux-distro'>
+                    The Linux Distributions</ulink> section and  
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>
+                    The Packages</ulink> section both
                     in the Yocto Project Quick Start for requirements.</para></listitem>
                 <listitem><para><emphasis>Establish a local copy of the Yocto Project files on your 
                     system</emphasis>:  You need to have the Yocto Project files available on your host system. 
                     Having the Yocto Project files on your system gives you access to the build
-                    process and to the tools you need.
+                    process and tools you need.
                     For information on how to get these files, see the
-                    "<link linkend='getting-setup'>Getting Setup</link>" section.</para></listitem>
+                    <xref linkend='getting-setup'>Getting Setup</xref> section in this manual.</para></listitem>
                 <listitem><para><emphasis>Establish a local copy of the base BSP files</emphasis>:  Having    
                     the BSP files on your system gives you access to the build
-                    process and to the tools you need for creating a BSP.
-                    For information on how to get these files, see the
-                    "<link linkend='getting-setup'>Getting Setup</link>" section.</para></listitem>    
+                    process and tools you need.
+                    For information on how to get these files, see 
+                    <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual.</para></listitem>    
                 <listitem><para><emphasis>Choose a Yocto Project-supported BSP as your base BSP</emphasis>:  
                     The Yocto Project ships with several BSPs that support various hardware.  
                     It is best to base your new BSP on an existing BSP rather than create all the 
                     recipes and configuration files from scratch.  
                     While it is possible to create everything from scratch, basing your new BSP 
                     on something that is close is much easier.  
-                    Or, at a minimum, leveraging off an existing BSP
-                    gives you some structure with which to start.</para>
+                    Or, at a minimum, it gives you some structure with which to start.</para>
                     <para>At this point you need to understand your target hardware well enough to determine which 
                     existing BSP it most closely matches.  
-                    Things to consider are your hardware’s on-board features, such as CPU type and graphics support.  
+                    Things to consider are your hardware’s on-board features such as CPU type and graphics support.  
                     You should look at the README files for supported BSPs to get an idea of which one 
                     you could use.  
-                    A generic <trademark class='registered'>Intel</trademark> 
-                    <trademark class='trade'>Atom</trademark>-based BSP to consider is the 
-                    Crown Bay that does not support the <trademark class='registered'>Intel</trademark> 
-                    Embedded Media Graphics Driver (EMGD).  
+                    A generic Atom-based BSP to consider is the Crown Bay that does not support
+                    the Intel® Embedded Media Graphics Driver (EMGD).  
                     The remainder of this example uses that base BSP.</para>
-                    <para>To see the supported BSPs, go to the 
-                    <ulink url='&YOCTO_HOME_URL;/download'>Download</ulink> page on the Yocto Project
-                    website and click on “BSP Downloads.”</para></listitem>
+                    <para>To see the supported BSPs, go to the Yocto Project
+                    <ulink url='http://www.yoctoproject.org/download'>download page</ulink> and click 
+                    on “BSP Downloads.”</para></listitem>
                 <listitem><para><emphasis>Create your own BSP layer</emphasis>:  Layers are ideal for 
                     isolating and storing work for a given piece of hardware.  
-                    A layer is really just a location or area in which you place the recipes for your BSP.
+                    A layer is really just a location or area in which you place the recipes for your BSP.  
                     In fact, a BSP is, in itself, a special type of layer.   
-                    </para>
-                    <para>
-                    Another example that illustrates a layer is an application.  
+                    Consider an application as another example that illustrates a layer.  
                     Suppose you are creating an application that has library or other dependencies in 
                     order for it to compile and run.  
                     The layer, in this case, would be where all the recipes that define those dependencies 
-                    are kept.  
-                    The key point for a layer is that it is an isolated area that contains 
+                    are kept.  The key point for a layer is that it is an isolated area that contains 
                     all the relevant information for the project that the Yocto Project build 
                     system knows about.</para>
                     <note>The Yocto Project supports four BSPs that are part of the 
                     Yocto Project release: <filename>atom-pc</filename>, <filename>beagleboard</filename>,
                     <filename>mpc8315e</filename>, and <filename>routerstationpro</filename>.  
                     The recipes and configurations for these four BSPs are located and dispersed 
-                    within the local Yocto Project files.
+                    within local Yocto Project files.
                     Consequently, they are not totally isolated in the spirit of layers unless you think 
                     of <filename>meta-yocto</filename> as a layer itself.  
                     On the other hand, BSP layers for Crown Bay, Emenlow, Jasper Forest, 
                     N450, and Sugar Bay are isolated.</note>
-                    <para>When you set up a layer for a new BSP, you should follow a standard layout.  
-                    This layout is described in the section
-                    "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-filelayout'>Example Filesystem Layout</ulink>"
-                    section of the Board Support Package (BSP) Development Guide.  
-                    In the standard layout, you will notice a suggested structure for recipes and  
+                    <para>When you set up a layer for a new BSP you should follow a standard layout.  
+                    This layout is described in the
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html#bsp-filelayout'>
+                    Example Filesystem Layout</ulink> section of the Board Support Package (BSP) Development
+                    Guide.  
+                    In the standard layout you will notice a suggested structure for recipes and  
                     configuration information.  
                     You can see the standard layout for the Crown Bay BSP in this example by examining the 
                     directory structure of the <filename>meta-crownbay</filename> layer inside the 
                     local Yocto Project files.</para></listitem>
                 <listitem><para><emphasis>Make configuration changes to your new BSP 
-                    layer</emphasis>:  The standard BSP layer structure organizes the files you need 
-                    to edit in <filename>conf</filename> and several <filename>recipes-*</filename>
-                    directories within the BSP layer.
+                    layer</emphasis>:  The standard BSP layer structure organizes the files you need to edit in 
+                    <filename>conf</filename> and several <filename>recipes-*</filename> within the 
+                    BSP layer.
                     Configuration changes identify where your new layer is on the local system
                     and identify which kernel you are going to use.
                     </para></listitem>
@@ -159,23 +148,24 @@
                     recipes you don't use, and adding new recipes that you need to support your hardware.
                     </para></listitem>
                 <listitem><para><emphasis>Prepare for the build</emphasis>:  Once you have made all the 
-                    changes to your BSP layer, there remains a few things 
+                    changes to your BSP layer there remains a few things 
                     you need to do for the Yocto Project build system in order for it to create your image.  
                     You need to get the build environment ready by sourcing an environment setup script 
                     and you need to be sure two key configuration files are configured appropriately.</para>
-                    <para>The entire process for building an image is overviewed in the section
-                    "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>" section 
-                    of the Yocto Project Quick Start.    
+                    <para>The entire process for building an image is overviewed in the 
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>
+                    Building an Image</ulink> section of the Yocto Project Quick Start.    
                     You might want to reference this information.</para></listitem>
                 <listitem><para><emphasis>Build the image</emphasis>:  The Yocto Project uses the BitBake 
                     tool to build images based on the type of image you want to create.  
                     You can find more information on BitBake 
                     <ulink url='http://bitbake.berlios.de/manual/'>here</ulink>.</para>
                     <para>The build process supports several types of images to satisfy different needs.  
-                    See the 
-                    "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>" appendix 
-                    in The Yocto Project Reference Manual for information on 
-                    supported images.</para></listitem>
+                    See 
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>
+                    Reference: Images</ulink> in the 
+                    <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+                    Yocto Project Reference Manual</ulink>for information on supported images.</para></listitem>
             </orderedlist>
         </para>
 
@@ -183,11 +173,11 @@
             You can view a video presentation on "Building Custom Embedded Images with Yocto"
             at <ulink url='http://free-electrons.com/blog/elc-2011-videos'>Free Electrons</ulink>.  
             You can also find supplemental information in  
-            <ulink url='&YOCTO_DOCS_BSP_URL;'>
+            <ulink url='http://yoctoproject.org/docs/1.1/bsp-guide/bsp-guide.html'>
             The Board Support Package (BSP) Development Guide</ulink>.
-            Finally, there is wiki page write up of the example also located 
-            <ulink url='&YOCTO_WIKI_URL;/wiki/Transcript:_creating_one_generic_Atom_BSP_from_another'>
-            here</ulink> that you might find helpful.
+            Finally, there is wiki page write up of the example located 
+            <ulink url='https://wiki.yoctoproject.org/wiki/Transcript:_creating_one_generic_Atom_BSP_from_another'>
+            here</ulink> you might find helpful.
        </para>
     </section>
 
@@ -196,7 +186,7 @@
 
         <para>
             Kernel modification involves changing the Linux Yocto kernel, which could involve changing
-            configuration options as well as adding new kernel recipes.  
+            configuration variables as well as adding new kernel recipes.  
             Configuration changes can be added in the form of configuration fragments, while recipe
             modification comes through the kernel's <filename>recipes-kernel</filename> area
             in a kernel layer you create.
@@ -206,10 +196,9 @@
             The remainder of this section presents a high-level overview of the Linux Yocto 
             kernel architecture and the steps to modify the Linux Yocto kernel.
             For a complete discussion of the kernel, see  
-            <ulink url='&YOCTO_DOCS_KERNEL_URL;'>
+            <ulink url='http://www.yoctoproject.org/docs/1.1/kernel-manual/kernel-manual.html'>
             The Yocto Project Kernel Architecture and Use Manual</ulink>.
-            You can reference the appendix 
-            "<link linkend='dev-manual-kernel-appendix'>Kernel Modification Example</link>"
+            You can reference <xref linkend='dev-manual-kernel-appendix'>Kernel Modification Example</xref>
             for a detailed example that changes the configuration of a kernel.
         </para>
 
@@ -217,41 +206,34 @@
             <title>Kernel Overview</title>
 
             <para>
-                Traditionally, when one thinks of a patched kernel, they think of a base kernel
-                source tree and a fixed structure that contains kernel patches.
-                The Yocto Project, however, employs mechanisms, that in a sense, result in a kernel source
+                When one thinks of the source files for a kernel they usually think of a fixed structure 
+                of files that contain kernel patches.
+                The Yocto Project, however, employs mechanisims, that in a sense, result in a kernel source
                 generator.
-                By the end of this section, this analogy will become clearer.
             </para>
 
             <para>
                 You can find a web interface to the Linux Yocto kernel source repositories at
-                <ulink url='&YOCTO_GIT_URL;'></ulink>.
+                <ulink url='http://git.yoctoproject.org/'></ulink>.
                 If you look at the interface, you will see to the left a grouping of 
                 Git repositories titled "Yocto Linux Kernel."  
-                Within this group, you will find several kernels supported by 
+                Within this group, you will find the four different kernels supported by 
                 the Yocto Project:
                 <itemizedlist>
                     <listitem><para><emphasis><filename>linux-yocto-2.6.34</filename></emphasis> - The 
                     stable Linux Yocto kernel that is based on the Linux 2.6.34 release.</para></listitem>
                     <listitem><para><emphasis><filename>linux-yocto-2.6.37</filename></emphasis> - The
                     stable Linux Yocto kernel that is based on the Linux 2.6.37 release.</para></listitem>
-                    <listitem><para><emphasis><filename>linux-yocto-3.0</filename></emphasis> - The stable
+                    <listitem><para><emphasis><filename>linux-yocto-3.0</filename></emphasis> - The current
                     Linux Yocto kernel that is based on the Linux 3.0 release.</para></listitem>
-                    <listitem><para><emphasis><filename>linux-yocto-3.0-1.1.x</filename></emphasis> - The 
-                    stable Linux Yocto kernel to use with the Yocto Project Release 1.1.x. This kernel 
-                    is based on the Linux 3.0 release</para></listitem>
-                    <listitem><para><emphasis><filename>linux-yocto-3.2</filename></emphasis> - The 
-                    stable Linux Yocto kernel to use with the Yocto Project Release 1.2. This kernel 
-                    is based on the Linux 3.2 release</para></listitem>
                     <listitem><para><emphasis><filename>linux-yocto-dev</filename></emphasis> - A development
                     kernel based on the latest upstream release candidate available.</para></listitem>
                 </itemizedlist>
             </para>
 
             <para>
-                The kernels are maintained using the Git revision control system
-                that structures them using the familiar "tree", "branch", and "leaf" scheme.
+                The kernels are maintained using the Git application that, in a sense, structures
+                them in a "tree" complete with branches and leaves.
                 Branches represent diversions from general code to more specific code, while leaves
                 represent the end-points for a complete and unique kernel whose source files 
                 when gathered from the root of the tree to the leaf accumulate to create the files
@@ -264,7 +246,7 @@
 
             <para>
                 Within the figure, the "Kernel.org Branch Point" represents the point in the tree
-                where a supported base kernel is modified from the Linux kernel.
+                where a supported base kernel diverges from the Linux kernel.
                 For example, this could be the branch point for the <filename>linux-yocto-3.0</filename>
                 kernel.
                 Thus, everything further to the right in the structure is based on the 
@@ -278,14 +260,14 @@
 
             <para>
                 The overall result is a Git-maintained repository from which all the supported
-                Yocto Project kernel types can be derived for all the supported Yocto Project devices.
+                Yocto Project kernels can be derived for all the supported Yocto Project devices.
                 A big advantage to this scheme is the sharing of common features by keeping them in 
                 "larger" branches within the tree.  
                 This practice eliminates redundant storage of similar features shared among kernels.
             </para>
 
             <note>
-                Keep in mind the figure does not take into account all the supported Linux Yocto
+                Keep in mind the figure does not take into account all four supported Linux Yocto
                 kernel types, but rather shows a single generic kernel just for conceptual purposes.
                 Also keep in mind that this structure represents the Yocto Project source repositories 
                 that are either pulled from during the build or established on the host development system
@@ -322,7 +304,7 @@
             </para>
 
             <para>
-                <imagedata fileref="figures/kernel-overview-3-edison.png" 
+                <imagedata fileref="figures/kernel-overview-3.png" 
                     width="6in" depth="4in" align="center" scale="100" />
             </para> 
 
@@ -360,11 +342,11 @@
             <para>
                 Again, for a complete discussion of the Yocto Project kernel's architcture and its 
                 branching strategy,
-                see <ulink url='&YOCTO_DOCS_KERNEL_URL;'>
+                see the <ulink url='http://www.yoctoproject.org/docs/1.1/kernel-manual/kernel-manual.html'>
                 The Yocto Project Kernel Architecture and Use Manual</ulink>.
-                You can also reference the
-                "<link linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source Code</link>"
-                section for a detailed example that modifies the kernel.
+                Also, you can reference 
+                <xref linkend='modifying-the-kernel-source-code'>Modifying the Kernel Source Code</xref>
+                for a detailed example that modifies the kernel.
             </para>
         </section> 
 
@@ -376,22 +358,24 @@
             </para>
 
             <para>
-                <imagedata fileref="figures/kernel-dev-flow.png" 
-                    width="6in" depth="7.5in" align="center" scalefit="1" />
+                <imagedata fileref="figures/kernel-dev-flow.png" width="6in" depth="7in" align="center" scalefit="1" />
             </para> 
 
             <para>
                 <orderedlist>
                     <listitem><para><emphasis>Set up your host development system to support 
                         development using the Yocto Project</emphasis>:  See  
-                        "<ulink url='&YOCTO_DOCS_QS_URL;#the-linux-distro'>The Linux Distributions</ulink>" and  
-                        "<ulink url='&YOCTO_DOCS_QS_URL;#packages'>The Packages</ulink>" sections both
+                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#the-linux-distro'>
+                        The Linux Distributions</ulink> section and  
+                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#packages'>
+                        The Packages</ulink> section both
                         in the Yocto Project Quick Start for requirements.</para></listitem>
                     <listitem><para><emphasis>Establish a local copy of the Yocto Project files on your 
                         system</emphasis>:  Having the Yocto Project files on your system gives you access to 
                         the build process and tools you need.
                         For information on how to get these files, see the bulleted item
-                        "<link linkend='local-yp-release'>Yocto Project Release</link>" earlier in this manual.
+                        <link linkend='local-yp-release'>Yocto Project Release</link> in  
+                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual.
                         </para></listitem>
                     <listitem><para><emphasis>Set up the <filename>poky-extras</filename> Git 
                         repository</emphasis>:  This repository is the area for your configuration 
@@ -400,96 +384,85 @@
                         It is good practice to set this repository up inside the local Yocto
                         Project files Git repository.
                         For information on how to get these files, see the bulleted item
-                        "<link linkend='poky-extras-repo'>The <filename>poky-extras</filename> Git Repository</link>"
-                        earlier in this manual.
-                        <note>While it is certainly possible to modify the kernel without involving
-                            a local Git repository, the suggested workflow for kernel modification
-                            using the Yocto Project does use a Git repository.</note></para></listitem>
+                        <link linkend='poky-extras-repo'>The 
+                        <filename>poky-extras</filename> Git Repository</link> in
+                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual.
+                        </para></listitem>
                     <listitem><para><emphasis>Establish a local copy of the Linux Yocto kernel files on your 
                         system</emphasis>:  In order to make modifications to the kernel you need two things:
-                        a bare clone of the Linux Yocto kernel you are modifying and  
-                        a copy of that bare clone. 
+                        a bare clone of the Linux Yocto kernel you are modifying and a copy of that 
+                        bare clone. 
                         The bare clone is required by the build process and is the area to which you 
-                        push your kernel source changes (pulling does not work with bare clones). 
+                        push your kernel source changes. 
                         The copy of the bare clone is a local Git repository that contains all the kernel's 
                         source files. 
                         You make your changes to the files in this copy of the bare clone.
                         For information on how to set these two items up, see the bulleted item
-                        "<link linkend='local-kernel-files'>Linux Yocto Kernel</link>" 
-                        earlier in this manual.</para></listitem>
+                        <link linkend='local-kernel-files'>Linux Yocto Kernel</link> in  
+                        <xref linkend='getting-setup'>Getting Setup</xref> earlier in this manual.
+                        </para></listitem>
                     <listitem><para><emphasis>Make changes to the kernel source code if 
                         applicable</emphasis>:  Modifying the kernel does not always mean directly
                         changing source files. 
-                        However, if you have to do this, you make the changes in the local 
+                        However, if you have to do this then you make the changes in the local 
                         Git repository you set up to hold the source files (i.e. the copy of the 
                         bare clone).
-                        Once the changes are made, you need to use Git commands to commit the changes
+                        Once the changes are made you need to use Git commands to commit the changes
                         and then push them to the bare clone.</para></listitem>                      
                     <listitem><para><emphasis>Make kernel configuration changes
-                        if applicable</emphasis>:  
-                        If your situation calls for changing the kernel's configuration, you can 
+                        to your local kernel layer if applicable</emphasis>:  
+                        If your situation calls for changing the kernel's configuration you can 
                         use <filename>menuconfig</filename>
                         to enable and disable kernel configurations.  
-                        Using <filename>menuconfig</filename> allows you to interactively develop and test the 
-                        configuration changes you are making to the kernel.
-                        When saved, changes using <filename>menuconfig</filename> update the kernel's
-                        <filename>.config</filename>.
-                        Try to resist the temptation of directly editing the <filename>.config</filename> 
-                        file found in the Yocto Project build directory at 
-                        <filename>tmp/sysroots/&lt;machine-name&gt;/kernel</filename>.
-                        Doing so, can produce unexpected results when the Yocto Project build system 
-                        regenerates the configuration file.</para>
-                        <para>Once you are satisfied with the configuration changes made using 
-                        <filename>menuconfig</filename>, you can directly examine the 
-                        <filename>.config</filename> file against a saved original and gather those
-                        changes into a config fragment to be referenced from within the kernel's   
-                        <filename>.bbappend</filename> file.</para></listitem>                      
-                    <listitem><para><emphasis>Add or extend kernel recipes if applicable</emphasis>:  
-                        The standard 
+                        Using <filename>menuconfig</filename> allows you to develop and test the 
+                        configuration changes you are making to the kernel.</para></listitem>                      
+                    <listitem><para><emphasis>Add new kernel recipes if applicable</emphasis>:  The standard 
                         layer structure organizes recipe files inside the 
                         <filename>meta-kernel-dev</filename> layer that is within the 
                         <filename>poky-extras</filename> Git repository.
-                        If you need to add new kernel recipes, you add them within this layer. 
-                        Also within this area, you will find the <filename>.bbappend</filename> 
+                        If you need to add new kernel recipes you add them within this layer. 
+                        Also within this area you will find the <filename>.bbappend</filename> 
                         file that appends information to the kernel's recipe file used during the 
                         build.
                         </para></listitem>
                     <listitem><para><emphasis>Prepare for the build</emphasis>:  Once you have made all the 
                         changes to your kernel (configurations, source code changes, recipe additions, 
-                        or recipe changes), there remains a few things 
-                        you need to do in order for the Yocto Project build system (BitBake) to create your image.  
-                        If you have not done so, you need to get the build environment ready by sourcing 
+                        or recipe changes) there remains a few things 
+                        you need to do for the Yocto Project build system in order for it to create your image.  
+                        If you have not done so you need to get the build environment ready by sourcing 
                         the environment setup script described earlier.
                         You also need to be sure two key configuration files 
                         (<filename>local.conf</filename> and <filename>bblayers.conf</filename>)
                         are configured appropriately.</para>
                         <para>The entire process for building an image is overviewed in the 
-                        "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>" 
-                        section of the Yocto Project Quick Start.    
+                        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>
+                        Building an Image</ulink> section of the Yocto Project Quick Start.    
                         You might want to reference this information.
                         Also, you should look at the detailed examples found in the appendices at 
-                        at the end of this manual.</para></listitem>
-                    <listitem><para><emphasis>Build the image</emphasis>:  The Yocto Project 
-                        build system Poky uses the BitBake 
+                        end of this manual.</para></listitem>
+                    <listitem><para><emphasis>Build the image</emphasis>:  The Yocto Project uses the BitBake 
                         tool to build images based on the type of image you want to create.  
                         You can find more information on BitBake 
                         <ulink url='http://bitbake.berlios.de/manual/'>here</ulink>.</para>
                         <para>The build process supports several types of images to satisfy different needs.  
-                        See the appendix
-                        "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>" in 
-                        The Yocto Project Reference Manual for information on supported images.</para></listitem>
+                        See 
+                        <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>
+                        Reference: Images</ulink> in the 
+                        <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+                        Yocto Project Reference Manual</ulink> for information on supported 
+                        images.</para></listitem>
                     <listitem><para><emphasis>Make your configuration changes available
-                        in the kernel layer</emphasis>:  Up to this point, all the configuration changes to the 
+                        in the kernel layer</emphasis>:  Up to this point all the configuration changes to the 
                         kernel have been done and tested iteratively.  
-                        Once they are tested and ready to go, you can move them into the kernel layer, 
-                        which allows you to distribute the layer.</para></listitem>
-                    <listitem><para><emphasis>If applicable, share your in-tree changes</emphasis>:  
-                        If the changes you made
-                        are suited for all Linux Yocto users, you might want to send them on for inclusion
-                        into the Linux Yocto Git repository. 
-                        If the changes are accepted, the Yocto Project Maintainer pulls them into 
-                        the master branch of the kernel tree. 
-                        Doing so makes them available to everyone using the kernel.</para></listitem> 
+                        Once they are tested and ready to go you can move them into the kernel layer, 
+                        which allows you to distribute the layer.
+                        [WRITER'S NOTE:  Not sure if the layer is meta-kernel-dev or if it would be 
+                        a new layer copied from the work done there.]</para></listitem>
+                    <listitem><para><emphasis>Push your configuration and recipe changes upstream to the 
+                        linux Yocto Git repository (in-tree changes)</emphasis>:  If the changes you made
+                        are suited for all Linux Yocto users you might want to push the changes up into 
+                        the Linux Yocto Git repository so that they become part of the kernel tree
+                        and available to everyone using the kernel.</para></listitem> 
                 </orderedlist>
             </para>
         </section>
@@ -497,192 +470,11 @@
 </section>
 
 <section id='place-holder-section-two'>
-    <title>Application Development Workflow</title>
+    <title>Place-Holder Section For Application Development</title>
 
     <para>
-        Application development involves creation of an application that you want to be able
-        to run on your target hardware, which is running a Linux Yocto image.
-        The Yocto Project provides an Application Development Toolkit (ADT) that 
-        facilitates quick development and integration of your application into its run-time environment. 
-        Using the ADT you can employ cross-development toolchains designed for your target hardware
-        to compile and link your application. 
-        You can then deploy your application to the actual hardware or to the QEMU emulator for testing.
-        If you are familiar with the popular Eclipse IDE, you can use an Eclipse Yocto Plug-in to 
-        allow you to develop, deploy, and test your application all from within Eclipse.
+        Text needed here.
     </para>
-
-    <para>
-        While we strongly suggest using the Yocto Project ADT to develop your application, you might
-        not want to.  
-        If this is the case, you can still use pieces of the Yocto Project for your development process. 
-        However, because the process can vary greatly, this manual does not provide detail on the process.
-    </para>
-
-    <section id='workflow-using-the-adt-and-eclipse'>
-        <title>Workflow Using the ADT and <trademark class='trade'>Eclipse</trademark></title>
-
-        <para>
-            To help you understand how application development works in the Yocto Project ADT
-            environment, this section 
-            provides an overview of the general development process.
-            If you want to see a detailed example of the process as it is used from within the Eclipse 
-            IDE, see 
-            <ulink url='&YOCTO_DOCS_ADT_URL;'>
-            The Application Development Toolkit (ADT) User's Manual</ulink>.
-        </para>
-
-        <para>
-            This illustration and the following list summarizes the application development general workflow.
-        </para>
-
-        <para>
-            <imagedata fileref="figures/app-dev-flow.png" 
-                width="7in" depth="8in" align="center" scale="100" />
-        </para> 
-
-        <para>
-            <orderedlist>
-                <listitem><para><emphasis>Prepare the Host System for the Yocto Project</emphasis>:  
-                    See  
-                    "<ulink url='&YOCTO_DOCS_QS_URL;#the-linux-distro'>The Linux Distributions</ulink>" and  
-                    "<ulink url='&YOCTO_DOCS_QS_URL;#packages'>The Packages</ulink>" sections both
-                    in the Yocto Project Quick Start for requirements.</para></listitem>
-
-<!--
-WRITER NOTE:  The areas to get the kernel and root filesystem are located in the Index of 
-              downloads.  There are many forms of each.  The files that have "rootfs" are just the 
-              target root filesystems.  The file that is very small and starts with bzImage is just
-              the kernel image isolated so that it can be written to a special on-board area of 
-              flash memory.  Some systems require this.  In the machines directory there are  
-              files that combine the kernel image and the root filesystem.  These files are the ISO 
-              and HDDIMG files.  ISO images are designed to be deployed on a DVD or CD.  The ISO
-              images are designed to be deployed on a USB stick.  There might be some relics in 
-              the machine directory.  For example, there is the "emenlow-bernard-5.0.0.tar.bz2" 
-              file.  Nobody seems to know what this is.  If a developer needs the image and the 
-              root filesystem I think that they want the small kernel image and a matching root 
-              filesystem.  Although, Paul Eggleton says that the HDDIMG types could be used to 
-              develop on.  I am not sure that we can use one of those in the ADT though as they 
-              want you to point to the kernel image and the target root filesystem.  Maybe you 
-              could just point to the same spot.  I am not sure.
--->
-
-                <listitem><para><emphasis>Secure the Linux Yocto Kernel Target Image</emphasis>:  
-                    You must have a target kernel image that has been built using the Yocto Project.</para>
-                    <para>Depending on whether the Yocto Project has a pre-built image that matches your target
-                    architecture and where you are going to run the image while you develop your application
-                    (QEMU or real hardware), the area from which you get the image differs.
-                        <itemizedlist>
-                            <listitem><para>Download the image from  
-                                <ulink url='&YOCTO_MACHINES_DL_URL;'>  
-                                <filename>machines</filename></ulink> if your target architecture is supported
-                                and you are going to develop and test your application on actual hardware. 
-                                </para></listitem>
-                            <listitem><para>Download the image from the 
-                                <ulink url='&YOCTO_QEMU_DL_URL;'>  
-                                <filename>machines/qemu</filename></ulink> if your target architecture is supported
-                                and you are going to develop and test your application using the QEMU 
-                                emulator.</para></listitem>
-                            <listitem><para>Build your image if you cannot find a pre-built image that matches
-                                your target architecture.
-                                If your target architecture is similar to a supported architecture, you can 
-                                modify the kernel image before you build it.
-                                See the 
-                                "<link linkend='kernel-modification-workflow'>Kernel Modification Workflow</link>"
-                                section earlier in this manual for information on how to create a modified 
-                                Linux Yocto kernel.</para></listitem>
-                        </itemizedlist></para>
-                    <para>For information on pre-built kernel image naming schemes for images 
-                    that can run on the QEMU emulator, see the
-                    "<ulink url='&YOCTO_DOCS_QS_URL;#using-pre-built'>Using Pre-Built Binaries and QEMU</ulink>"
-                    section in the Yocto Project Quick Start.</para></listitem>
-                <listitem><para><emphasis>Install the ADT</emphasis>:  
-                    The ADT provides a target-specific cross-development toolchain, the root filesystem,
-                    the QEMU emulator, and other tools that can help you develop your application.
-                    While it is possible to get these pieces separately, the Yocto Project provides an 
-                    easy method.
-                    You can get these pieces by running an ADT installer script, which is configurable.
-                    For information on how to install the ADT, see the
-                    "<ulink url='&YOCTO_DOCS_ADT_URL;#using-the-adt-installer'>Using the ADT Installer</ulink>"
-                    section 
-                    in the Yocto Project Application Development (ADT) User's Manual.</para></listitem>
-                <listitem><para><emphasis>If Applicable, Secure the Target Root Filesystem</emphasis>:  
-                    If you choose not to install the ADT using the ADT Installer,
-                    you need to find and download the 
-                    appropriate root filesystems.
-                    You can find these tarballs in the same areas used for the kernel images.
-                    Depending on the type of image you are running, the root filesystem you need differs. 
-                    For example, if you are developing an application that runs on an image that 
-                    supports Sato, you need to get root filesystem that supports Sato.
-                    </para></listitem>
-                <listitem><para><emphasis>Create and Build your Application</emphasis>:  
-                    At this point, you need to have source files for your application.
-                    Once you have the files, you can use the Eclipse IDE to import them and build the 
-                    project. 
-                    If you are not using Eclipse, you need to use the cross-development tools you have 
-                    installed to create the image.</para></listitem>                      
-                <listitem><para><emphasis>Deploy the Image with the Application</emphasis>:  
-                    If you are using the Eclipse IDE, you can deploy your image to the hardware or to 
-                    QEMU through the project's preferences.  
-                    If you are not using the Eclipse IDE, then you need to deploy the application using 
-                    other methods to the hardware.
-                    Or, if you are using QEMU, you need to use that tool and load your image in for testing. 
-                    </para></listitem>                      
-                <listitem><para><emphasis>Test and Debug the Application</emphasis>:  
-                    Once your application is deployed, you need to test it.
-                    Within the Eclipse IDE, you can use the debubbing environment along with the 
-                    set of user-space tools installed along with the ADT to debug your application. 
-                    Of course, the same user-space tools are available separately to use if you choose
-                    not to use the Eclipse IDE.</para></listitem>
-           </orderedlist>
-        </para>
-    </section>
-
-    <section id='workflow-without-adt'>
-        <title>Workflow Without ADT</title>
-
-        <para>
-            If you want to develop an application outside of the Yocto Project ADT environment, you 
-            can still employ the cross-development toolchain, the QEMU emulator, and a number of supported
-            target image files.  
-            You just need to follow these general steps:
-            <orderedlist>
-                <listitem><para><emphasis>Install the cross-development toolchain for your target hardware:</emphasis> 
-                    For information on how to install the toolchain, see the
-                    "<ulink url='&YOCTO_DOCS_ADT_URL;#using-an-existing-toolchain-tarball'>Using a Cross-Toolchain Tarball</ulink>" 
-                    section
-                    in the Yocto Project Application Development (ADT) User's Manual.</para></listitem>
-                <listitem><para><emphasis>Download the Target Image:</emphasis>  The Yocto Project supports
-                    several target architectures and has many pre-built kernel images and root filesystem 
-                    images.</para>
-                    <para>If you are going to develop your application on hardware, go to the 
-                    <ulink url='&YOCTO_MACHINES_DL_URL;'>  
-                    <filename>machines</filename></ulink> download area and choose a target machine area
-                    from which to download the kernel image and root filesystem.
-                    This download area could have several files in it that support development using   
-                    actual hardware. 
-                    For example, the area might contain <filename>.hddimg</filename> files that combine the 
-                    kernel image with the filesystem, boot loaders, etc.
-                    Be sure to get the files you need for your particular development process.</para>
-                    <para>If you are going to develop your application and then run and test it using the QEMU
-                    emulator, go to the 
-                    <ulink url='&YOCTO_QEMU_DL_URL;'>  
-                    <filename>machines/qemu</filename></ulink> download area.
-                    From this area, go down into the directory for your target architecture
-                    (e.g. <filename>qemux86_64</filename> for an 
-                    <trademark class='registered'>Intel</trademark>-based 64-bit architecture).
-                    Download kernel, root filesystem, and any other files you need for your process.
-                    <note>In order to use the root filesystem in QEMU, you need to extract it.
-                    See the 
-                    "<ulink url='&YOCTO_DOCS_ADT_URL;#extracting-the-root-filesystem'>Extracting the Root Filesystem</ulink>" section for information on how to extract the 
-                    root filesystem.</note></para></listitem>
-                <listitem><para><emphasis>Develop and Test your Application:</emphasis>  At this point, 
-                    you have the tools to develop your application.  
-                    If you need to separately install and use the QEMU emulator, you can go to 
-                    <ulink url='http://www.qemu.org'>QEMU Home Page</ulink> to download and learn about the 
-                    emulator.</para></listitem>
-            </orderedlist>
-        </para>
-    </section>
 </section>
 
 </chapter>

documentation/dev-manual/dev-manual-newbie.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='dev-manual-newbie'>
 
@@ -8,12 +7,12 @@
 
 <para>
     This chapter helps you understand the Yocto Project as an open source development project.
-    In general, working in an open source environment is very different from working in a 
-    closed, proprietary environment.  
+    In general, working in an open-source environment is very different than working in a 
+    proprietary environment.  
     Additionally, the Yocto Project uses specific tools and constructs as part of its development 
     environment.  
-    This chapter specifically addresses open source philosophy, licensing issues, code repositories, 
-    the open source distributed version control system Git, and best practices using the Yocto Project.
+    The chapter specifically addresses open source philosophy, licensing issues, code repositories, 
+    the open source distributed version control system Git, and best practices using Yocto Project.
 </para>
 
 <section id='open-source-philosophy'>
@@ -21,10 +20,10 @@
 
     <para>
         Open source philosophy is characterized by software development directed by peer production 
-        and collaboration through an active community of developers.
+        and collaboration through a concerned community of developers.  
         Contrast this to the more standard centralized development models used by commercial software 
         companies where a finite set of developers produce a product for sale using a defined set 
-        of procedures that ultimately result in an end product whose architecture and source material
+        of procedures that ultimately result in an end-product whose architecture and source material 
         are closed to the public.
     </para>
 
@@ -34,21 +33,23 @@
         stake in the software project.  
         The open source environment contains new copyright, licensing, domain, and consumer issues 
         that differ from the more traditional development environment.  
-        In an open source environment, the end product, source material, and documentation are
+        In an open source environment the end-product, source material, and documentation are 
         all available to the public at no cost.
     </para>
 
     <para>
         A benchmark example of an open source project is the Linux Kernel, which was initially conceived 
         and created by Finnish computer science student Linus Torvalds in 1991.  
-        Conversely, a good example of a non-open source project is the 
-        <trademark class='registered'>Windows</trademark> family of operating 
-        systems developed by <trademark class='registered'>Microsoft</trademark> Corporation.
+        Conversely, a good example of a non-open source project is the Windows family of operating 
+        systems developed by Microsoft Corporation.
     </para>
 
     <para>
         Wikipedia has a good historical description of the Open Source Philosophy  
         <ulink url='http://en.wikipedia.org/wiki/Open_source'>here</ulink>. 
+    </para>
+
+    <para>
         You can also find helpful information on how to participate in the Linux Community 
         <ulink url='http://ldn.linuxfoundation.org/book/how-participate-linux-community'>here</ulink>.
     </para>
@@ -59,28 +60,28 @@
 
     <para>
         The Yocto Project team maintains complete source repositories for all Yocto Project files 
-        at <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi'></ulink>.
+        <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi'>here</ulink>.
         This web-based source code browser is organized into categories by function such as
         IDE Plugins, Matchbox, Poky, Yocto Linux Kernel, and so forth.
         From the interface, you can click on any particular item in the "Name" column and 
         see the URL at the bottom of the page that you need to set up a Git repository for 
         that particular item.
-        Having a local Git repository of the Yocto Project files allows you to 
+        The ability to create Git repositories of the Yocto Project source allows you to 
         make changes, contribute to the history, and ultimately enhance the Yocto Project's 
         tools, Board Support Packages, and so forth.
     </para>
 
     <para>  
         Conversely, if you are a developer that is not interested in contributing back to the 
-        Yocto Project, you have the ability to simply download and extract release tarballs
+        Yocto Project you have the ability to simply download and extract release tarballs
         and use them within the Yocto Project environment.
-        All that is required is a particular release of the Yocto Project and 
+        All that is required is a particular release of Yocto Project, a kernel, and 
         your application source code.  
     </para>
 
     <para>
-        For any supported release of Yocto Project, you can go to the Yocto Project website’s 
-        <ulink url='&YOCTO_HOME_URL;/download'>download page</ulink> and get a 
+        For any supported release of Yocto Project you can go to the Yocto Project website’s 
+        <ulink url='http://www.yoctoproject.org/download'>download page</ulink> and get a 
         tarball of the release.  
         You can also go to this site to download any supported BSP tarballs.
         Unpacking the tarball gives you a hierarchical directory structure of Yocto Project 
@@ -95,28 +96,27 @@
     <para>
         In summary, here is where you can get the Yocto Project files needed for development:
         <itemizedlist>
-            <listitem><para><emphasis><ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi'>Source Repositories:</ulink></emphasis>
+            <listitem><para><emphasis><ulink url='http://git.yoctoproject.org/cgit/cgit.cgi'>Source Repositories:</ulink></emphasis>
                 This area contains IDE Plugins, Matchbox, Poky, Poky Support, Tools, Yocto Linux Kernel, and Yocto 
                 Metadata Layers.
                 You can create Git repositories for each of these areas.</para>
                 <para>
                 <imagedata fileref="figures/source-repos.png" align="center" width="6in" depth="4in" />
                 </para></listitem>
-            <listitem><para><anchor id='index-downloads' /><emphasis><ulink url='&YOCTO_DL_URL;/releases/'>Index of /releases:</ulink></emphasis>
-                This area contains index releases such as 
-                the <trademark class='trade'>Eclipse</trademark>
-                Yocto Plug-in, miscellaneous support, Poky, pseudo, cross-development toolchains,
-                and all released versions of Yocto Project in the form of images or tarballs.
+            <listitem><para><anchor id='index-downloads' /><emphasis><ulink url='http://autobuilder.yoctoproject.org/downloads/'>Index of /downloads:</ulink></emphasis>
+                This area contains an index of the Eclipse-plugin, miscellaneous support, poky, pseudo, and 
+                all released versions of Yocto Project in the form of images or tarballs.
                 Downloading and extracting these files does not produce a Git repository but rather 
-                a snapshot of a particular release or image.</para>
+                a snapshot of a particular release or image. 
+                [WRITER NOTE: link will be http://downloads.yoctoproject.org.]</para>
                 <para>
                 <imagedata fileref="figures/index-downloads.png" align="center" width="6in" depth="4in" />
                 </para></listitem>
-            <listitem><para><emphasis><ulink url='&YOCTO_HOME_URL;/download'>Yocto Project Download Page</ulink></emphasis>
+            <listitem><para><emphasis><ulink url='http://www.yoctoproject.org/download'>Yocto Project Download Page</ulink></emphasis>
                 This page on the Yocto Project website allows you to download any Yocto Project
                 release or Board Support Package (BSP) in tarball form.
                 The tarballs are similar to those found in the 
-                <ulink url='&YOCTO_DL_URL;/releases/'>Index of /releases:</ulink> area.</para>
+                <ulink url='http://autobuilder.yoctoproject.org/downloads/'>Index of /downloads:</ulink> area.</para>
                 <para>
                 <imagedata fileref="figures/yp-download.png" align="center" width="6in" depth="4in" />
             </para></listitem>
@@ -130,117 +130,77 @@
     <para>
         Following is a list of terms and definitions users new to the Yocto Project development 
         environment might find helpful.
-        While some of these terms are universal, the list includes them just in case:
+        Some terms are universal but are included here just in case:
     <itemizedlist>
-        <listitem><para><emphasis>Append Files:</emphasis> Files that append build information to 
-            a recipe file.  
-            Information in append files override the information in the similarly-named recipe file.
-            Append files use the <filename>.bbappend</filename> filename suffix.</para></listitem>
-        <listitem><para><emphasis>BitBake:</emphasis> The task executor and scheduler used by 
-            the Yocto Project to build images. 
-            For more information on BitBake, see the <ulink url='http://bitbake.berlios.de/manual/'>
-            BitBake documentation</ulink>.</para></listitem>
-        <listitem><para><emphasis>Classes:</emphasis> Files that provide for logic encapsulation
-            and inheritance allowing commonly used patterns to be defined once and easily used 
-            in multiple recipes.  
-            Class files end with the <filename>.bbclass</filename> filename extension.</para></listitem>
-        <listitem><para><emphasis>Configuration File:</emphasis>  Configuration information in the 
-            <filename>.conf</filename> files provides global definitions of variables.  
-            The <filename>conf/local.conf</filename> configuration file in the Yocto Project 
-            build directory defines user-defined variables that affect each build.  
-            The <filename>distro/poky.conf</filename> configuration file also in the 
-            build directory defines Yocto ‘distro’ configuration 
-            variables used only when building with this policy.  
-            Machine configuration files, which 
-            are located throughout the Yocto Project file structure, define
-            variables for specific hardware and are only used when building for that target 
-            (e.g. the <filename>machine/beagleboard.conf</filename> configuration file defines 
-            variables for the Texas Instruments ARM Cortex-A8 development board).  
-            Configuration files end with a <filename>.conf</filename> filename extension.</para></listitem>
-        <listitem><para><emphasis>Cross-Development Toolchain:</emphasis> A collection of software development
-            tools and utilities that allow you to develop software for targeted architectures.
-            This toolchain contains cross-compilers, linkers, and debuggers that are specific to 
-            an architecure.
-            You can use the Yocto Project to build cross-development toolchains in tarball form that when 
-            unpacked contain the development tools you need to cross-compile and test your software.
-            The Yocto Project ships with images that contain toolchains for supported architectures
-            as well.
-            Sometimes this toolchain is referred to as the meta-toolchain.</para></listitem>
-        <listitem><para><emphasis>Image:</emphasis> An image is the result produced when 
+        <listitem><para><emphasis>Image</emphasis> - An image is the result produced when 
             BitBake processes a given collection of recipes and related metadata.
             Images are the binary output that runs on specific hardware and for specific
             use cases.
             For a list of the supported image types that the Yocto Project provides, see the
-            "<ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>"
-            appendix in the Yocto Project Reference Manual.</para></listitem>
-        <listitem><para><emphasis>Layer:</emphasis> A collection of recipes representing the core, 
-            a BSP, or an application stack.</para></listitem>
-        <listitem><para><emphasis>Metadata:</emphasis> The files that BitBake parses when building an image. 
-            Metadata includes recipes, classes, and configuration files.</para></listitem>
-        <listitem><para><emphasis>OE-Core:</emphasis> A core set of metadata originating 
-            with OpenEmbedded (OE) that is shared between OE and the Yocto Project.
-            This metadata is found in the <filename>meta</filename> directory of the Yocto Project
-            files.</para></listitem>
-        <listitem><para><emphasis>Package:</emphasis> The packaged output from a baked recipe.
-            A package is generally the compiled binaries produced from the recipe's sources.  
-            You ‘bake’ something by running it through BitBake.</para></listitem>
-        <listitem><para><emphasis>Poky:</emphasis> The build tool that the Yocto Project 
-            uses to create images.</para></listitem>
-        <listitem><para><emphasis>Recipe:</emphasis> A set of instructions for building packages.  
+            <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>
+            Reference: Images</ulink> appendix in
+            <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+            The Yocto Project Reference Manual</ulink>.</para></listitem>
+        <listitem><para><emphasis>Recipe</emphasis> - A set of instructions for building packages.  
             A recipe describes where you get source code and which patches to apply.
-            Recipes describe dependencies for libraries or for other recipes, and they 
+            Recipes describe dependencies for libraries or for other recipes and they 
             also contain configuration and compilation options.  
             Recipes contain the logical unit of execution, the software/images to build, and 
             use the <filename>.bb</filename> file extension.</para></listitem>
-        <listitem><para><emphasis>Tasks:</emphasis> Arbitrary groups of software Recipes.  
-            You simply use Tasks to hold recipes that, when built, usually accomplish a single task.  
+        <listitem><para><emphasis>BitBake</emphasis> - The task executor and scheduler used by Yocto Project
+            to build images. 
+            For more information on BitBake, see the <ulink url='http://bitbake.berlios.de/manual/'>
+            BitBake documentation</ulink>.</para></listitem>
+        <listitem><para><emphasis>Package</emphasis> - The packaged output from a baked recipe.
+            A package is generally the compiled binaries produced from the recipe's sources.  
+            You ‘bake’ something by running it through BitBake.</para></listitem>
+        <listitem><para><emphasis>Layer</emphasis> - A collection of recipes representing the core, 
+            a BSP, or an application stack.</para></listitem>
+        <listitem><para><emphasis>Metadata</emphasis> - A term used throughout the Yocto Project 
+            documentation that refers to the files that BitBake parses when building an image. 
+            Metadata includes recipes, classes, and configuration files.</para></listitem>
+        <listitem><para><emphasis>Meta-Toolchain</emphasis> - A collection of software development
+            tools and utilities that allow you to develop software for targeted architectures.
+            These toolchains contain cross-compilers, linkers, and debuggers that are specific to 
+            an architecure.
+            You can use the Yocto Project to build meta-toolchains in tarball form that when 
+            unpacked contain the development tools you need to cross-compile and test your software.
+            The Yocto Project ships with images that contain toolchains for supported architectures
+            as well.</para></listitem>
+        <listitem><para><emphasis>Configuration File</emphasis>:  Configuration information in the 
+            <filename>.conf</filename> files provides global definitions of variables.  
+            The <filename>build/conf/local.conf</filename> configuration file defines user-defined variables
+            that effect each build.  
+            The <filename>distro/poky.conf</filename> configuration file defines Yocto ‘distro’ configuration 
+            variables used only when building with this policy.  
+            The <filename>machine/beagleboard.conf</filename> configuration file defines variables
+            for the Beagleboard and are only used when building for that target 
+            (i.e. Texas Instruments ARM Cortex-A8 development board).  
+            Configuration files end with a <filename>.conf</filename> filename extension.</para></listitem>
+        <listitem><para><emphasis>Classes</emphasis> - Files that provide for logic encapsulation
+            and inheritance allowing commonly used patterns to be defined once and easily used 
+            in multiple recipes.  
+            Class files end with the <filename>.bbclass</filename> filename extension.</para></listitem>
+        <listitem><para><emphasis>Append Files</emphasis> - Files that append build information to 
+            a recipe file.  
+            Information in append files override the information in the similarly-named recipe file.
+            Append files use the <filename>.bbappend</filename> filename suffix.</para></listitem>
+        <listitem><para><emphasis>Tasks</emphasis> - Arbitrary groups of software Recipes.  
+            You simply use Tasks to hold recipes that when built usually accomplish a single task.  
             For example, a task could contain the recipes for a company’s proprietary or value-add software.  
-            Or, the task could contain the recipes that enable graphics. 
+            Or the task could contain the recipes that enable graphics. 
             A task is really just another recipe.  
             Because task files are recipes, they end with the <filename>.bb</filename> filename 
             extension.</para></listitem>
-        <listitem><para><emphasis>Upstream:</emphasis> A reference to source code or repositories
+        <listitem><para><emphasis>OE-Core</emphasis> - A core set of metadata originating 
+            with OpenEmbedded (OE) that is shared between OE and the Yocto Project.
+            This metadata is found in the <filename>meta</filename> directory of the Yocto Project
+            files.</para></listitem>
+        <listitem><para><emphasis>Upstream</emphasis> - A reference to source code or repositories
             that are not local to the development system but located in a master area that is controlled
             by the maintainer of the source code.
-            For example, in order for a developer to work on a particular piece of code, they need to 
+            For example, in order for a developer to work on a particular piece of code they need to 
             first get a copy of it from an "upstream" source.</para></listitem>
-        <listitem><para><emphasis>Yocto Project Files:</emphasis>
-            This term refers to the directory structure created as a result of downloading 
-            and unpacking a Yocto Project release tarball or setting up a Git repository
-            by cloning <filename>git://git.yoctoproject.org/poky</filename>.
-            Sometimes the term "the Yocto Project Files structure" is used as well.</para>
-            <para>The Yocto Project files contain BitBake, Documentation, metadata and 
-            other files that all support the development environment. 
-            Consequently, you must have the Yocto Project files in place on your development 
-            system in order to do any development using the Yocto Project.</para>
-            <para>The name of the top-level directory of the Yocto Project file structure  
-            is derived from the Yocto Project release tarball.
-            For example, downloading and unpacking <filename>&YOCTO_POKY_TARBALL;</filename>
-            results in a Yocto Project file structure whose Yocto Project source directory is named 
-            <filename>&YOCTO_POKY;</filename>.
-            If you create a Git repository, then you can name the repository anything you like.</para>
-            <para>You can find instruction on how to set up the Yocto Project files on your 
-            host development system by reading 
-            the 
-            "<ulink url='&YOCTO_DOCS_DEV_URL;#getting-setup'>Getting
-            Setup</ulink>" section.</para></listitem>
-        <listitem><para><emphasis>Yocto Project Build Directory:</emphasis>
-            This term refers to the area used by the Yocto Project for builds.  
-            The area is created when you <filename>source</filename> the Yocto Project setup 
-            environment script that is found in the Yocto Project files area. 
-            (e.g. <filename>oe-init-build-env</filename>).
-            You can create the Yocto Project build directory anywhere you want on your 
-            development system.
-            Here is an example that creates the directory in <filename>mybuilds</filename> 
-            and names the Yocto Project build directory <filename>YP-&POKYVERSION;</filename>:
-            <literallayout class='monospaced'> 
-     $ source &OE_INIT_PATH; $HOME/mybuilds/YP-&POKYVERSION;
-            </literallayout>
-            If you don't specifically name the directory, BitBake creates it 
-            in the current directory and uses the name <filename>build</filename>.
-            Also, if you supply an existing directory, then BitBake uses that 
-            directory as the Yocto Project build directory and populates the build hierarchy
-            beneath it.</para></listitem>
     </itemizedlist>
     </para>
 </section>
@@ -249,9 +209,9 @@
     <title>Licensing</title>
 
     <para>
-        Because open source projects are open to the public, they have different licensing structures in place.  
+        Because open source projects are open to the public they have different licensing structures in place.  
         License evolution for both Open Source and Free Software has an interesting history.  
-        If you are interested in this history, you can find basic information here:
+        If you are interested in the history you can find basic information here:
     <itemizedlist>
         <listitem><para><ulink url='http://en.wikipedia.org/wiki/Open-source_license'>Open source license history</ulink>
             </para></listitem>
@@ -275,20 +235,15 @@
 
     <para>
         When you build an image using Yocto Project, the build process uses a known list of licenses to 
-        ensure compliance.
-        You can find this list in the Yocto Project files directory at 
-        <filename>meta/files/common-licenses</filename>.  
-        Once the build completes, the list of all licenses found and used during that build are 
-        kept in the Yocto Project build directory at 
-        <filename>tmp/deploy/images/licenses</filename>.
-    </para>
-
-    <para>  
+        ensure compliance.  
+        Once the build completes, the list of all licenses found and used during the build are 
+        kept in the resulting build directory at 
+        <filename>&lt;build_directory&gt;/tmp/deploy/images/licenses</filename>.  
         If a module requires a license that is not in the base list, the build process 
         generates a warning during the build.  
         These tools make it easier for a developer to be certain of the licenses with which
         their shipped products must comply.
-        However, even with these tools it is still up to the developer to resolve potential licensing issues.
+        However, it is still up to the developer to resolve potential licensing issues.
     </para>
 
     <para>
@@ -299,13 +254,14 @@
         for a standard format for communicating the components, licenses, and copyrights 
         associated with a software package.  
         <ulink url='http://opensource.org'>OSI</ulink> is a corporation dedicated to the Open Source 
-        Definition and the effort for reviewing and approving licenses that are OSD-conformant.  
+        Definition and the effort for reviewing 
+        and approving licenses that are OSD-conformant.  
     </para>
 
     <para>
         You can find a list of the combined SPDX and OSI licenses that the Yocto Project uses 
-        <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi/poky/tree/meta/files/common-licenses'>here</ulink>.
-        This wiki page discusses the license infrastructure used by the Yocto Project.
+        <ulink url='http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/files/common-licenses'>here</ulink>.
+        The wiki page discusses the license infrastructure used by the Yocto Project.
     </para>
 </section>
 
@@ -315,10 +271,7 @@
     <para>
         The Yocto Project uses Git, which is a free, open source distributed version control system.  
         Git supports distributed development, non-linear development, and can handle large projects.  
-        It is best that you have some fundamental understanding of how Git tracks projects and 
-        how to work with Git if you are going to use Yocto Project for development. 
-        This section provides a quick overview of how Git works and provides you with a summary
-        of some essential Git commands.
+        It is best that you know how to work with Git if you are going to use Yocto Project for development.  
     </para>
 
     <para>
@@ -329,7 +282,7 @@
         You do not have to be an expert in Git to be functional.  
         A good place to look for instruction on a minimal set of Git commands is 
         <ulink url='http://git-scm.com/documentation'>here</ulink>.   
-        If you need to download Git, you can do so 
+        If you need to download Git you can do so 
         <ulink url='http://git-scm.com/download'>here</ulink>. 
     </para>
 
@@ -341,7 +294,7 @@
         This methodology also allows for an environment in which you can do lots of 
         experimentation on your project as you develop changes or new features.  
         For example, you can create a “branch”, experiment with some feature, and then 
-        if you like the feature, you incorporate the branch into the tree.  
+        if you like the feature you incorporate the branch into the tree.  
         If you don’t, you cut the branch off by deleting it.  
     </para>
 
@@ -356,63 +309,55 @@
         omits the many arguments they support.  
         See the Git documentation for complete descriptions and strategies on how to use these commands:
     <itemizedlist>
-        <listitem><para><emphasis><filename>git init</filename>:</emphasis> Initializes an empty Git repository.  
+        <listitem><para><emphasis><filename>git init</filename></emphasis> – Initializes an empty Git repository.  
             You cannot use Git commands unless you have a <filename>.git</filename> repository.</para></listitem>
-        <listitem><para><emphasis><filename>git clone</filename>:</emphasis> Creates a clone of a repository.  
-            During collaboration, this command allows you to create a local repository that is on 
+        <listitem><para><emphasis><filename>git clone</filename></emphasis> – Creates a clone of a repository.  
+            During collaboration this command allows you to create a local repository that is on 
             equal footing with a fellow developer’s repository.</para></listitem>
-        <listitem><para><emphasis><filename>git add</filename>:</emphasis> Adds updated file contents 
-            to the index that 
+        <listitem><para><emphasis><filename>git add</filename></emphasis> – Adds updated file contents to the index that 
             Git uses to track changes.  
-            You must add all files that have changed before you can commit them.</para></listitem>
-        <listitem><para><emphasis><filename>git commit</filename>:</emphasis> Creates a “commit” that documents 
+            All files that have changed must be added before they can be committed.</para></listitem>
+        <listitem><para><emphasis><filename>git commit</filename></emphasis> – Creates a “commit” that documents 
             the changes you made.  
             Commits are used for historical purposes, for determining if a maintainer of a project 
             will allow the change, and for ultimately pushing the change from your local Git repository 
             into the project’s upstream (or master) repository.</para></listitem>
-        <listitem><para><emphasis><filename>git status</filename>:</emphasis> Reports any modified files that 
+        <listitem><para><emphasis><filename>git status</filename></emphasis> – Reports any modified files that 
             possibly need added and committed.</para></listitem>
-        <listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename>:</emphasis> Changes 
-            your working branch.  
-            This command is analogous to “cd”.</para></listitem>
-        <listitem><para><emphasis><filename>git checkout –b &lt;working-branch&gt;</filename>:</emphasis> Creates 
+        <listitem><para><emphasis><filename>git checkout &lt;branch-name&gt;</filename></emphasis> - Changes 
+            your working branch.  This command is analogous to “cd”.</para></listitem>
+        <listitem><para><emphasis><filename>git checkout –b &lt;working-branch&gt;</filename></emphasis> - Creates 
             a working branch on your local machine where you can isolate work.  
             It is a good idea to use local branches when adding specific features or changes.  
             This way if you don’t like what you have done you can easily get rid of the work.</para></listitem>
-        <listitem><para><emphasis><filename>git branch</filename>:</emphasis> Reports existing branches and 
+        <listitem><para><emphasis><filename>git branch</filename></emphasis> – Reports existing branches and 
             tells you which branch in which you are currently working.</para></listitem>
-        <listitem><para><emphasis><filename>git branch -D &lt;branch-name&gt;</filename>:</emphasis> 
-            Deletes an existing branch.  
-            You need to be in a branch other than the one you are deleting 
+        <listitem><para><emphasis><filename>git branch -D &lt;branch-name&gt;</filename></emphasis> – 
+            Deletes an existing branch.  You need to be in a branch other than the one you are deleting 
             in order to delete &lt;branch-name&gt;.</para></listitem>
-        <listitem><para><emphasis><filename>git pull</filename>:</emphasis> Retrieves information 
-            from an upstream Git 
+        <listitem><para><emphasis><filename>git pull</filename></emphasis> – Retrieves information from an upstream Git 
             repository and places it in your local Git repository.  
-            You use this command to make sure you are synchronized with the repository 
-            from which you are basing changes (.e.g. the master repository).</para></listitem>
-        <listitem><para><emphasis><filename>git push</filename>:</emphasis> Sends all your local changes you 
-            have committed to an upstream Git repository (e.g. a contribution repository).  
+            You use this command to make sure you are synchronized with the upstream repository 
+            from which the project’s maintainer uses to pull changes into the master repository.</para></listitem>
+        <listitem><para><emphasis><filename>git push</filename></emphasis> – Sends all your local changes you 
+            have committed to an upstream Git repository.  
             The maintainer of the project draws from these repositories when adding your changes to the 
             project’s master repository.</para></listitem>
-        <listitem><para><emphasis><filename>git merge</filename>:</emphasis> Combines or adds changes from one 
+        <listitem><para><emphasis><filename>git merge</filename></emphasis> – Combines or adds changes from one 
             local branch of your repository with another branch.  
-            When you create a local Git repository, the default branch is named “master”.  
+            When you create a local Git repository the default branch is named “master”.  
             A typical workflow is to create a temporary branch for isolated work, make and commit your 
-            changes, switch to your local master branch, merge the changes from the temporary branch into the 
-            local master branch, and then delete the temporary branch.</para></listitem>
-        <listitem><para><emphasis><filename>git cherry-pick</filename>:</emphasis> Choose and apply specific 
+            changes, switch to the master branch, merge the changes from the temporary branch into the 
+            master branch, and then delete the temporary branch</para></listitem>
+        <listitem><para><emphasis><filename>git cherry-pick</filename></emphasis> – Choose and apply specific 
             commits from one branch into another branch.  
             There are times when you might not be able to merge all the changes in one branch with 
             another but need to pick out certain ones.</para></listitem>
-        <listitem><para><emphasis><filename>gitk</filename>:</emphasis> Provides a GUI view of the branches 
+        <listitem><para><emphasis><filename>gitk</filename></emphasis> – Provides a GUI view of the branches 
             and changes in your local Git repository.  
-            This command is a good way to graphically see where things have diverged in your 
-            local repository.</para></listitem>
-        <listitem><para><emphasis><filename>git log</filename>:</emphasis> Reports a history of your changes to the 
+            This command is a good way to see where things have diverged in your local repository.</para></listitem>
+        <listitem><para><emphasis><filename>git log</filename></emphasis> – Reports a history of your changes to the 
             repository.</para></listitem>
-        <listitem><para><emphasis><filename>git diff</filename>:</emphasis> Displays line-by-line differences
-            between your local working files and the same files in the upstream Git repository that your 
-            branch currently tracks.</para></listitem>
     </itemizedlist>
     </para>
 </section>
@@ -424,22 +369,17 @@
         This section provides some overview on workflows using Git.  
         In particular, the information covers basic practices that describe roles and actions in a 
         collaborative development environment.  
-        Again, if you are familiar with this type of development environment, you might want to just 
-        skip this section.
+        Again, if you are familiar with this type of development environment you might want to just skip the section. 
     </para>
 
     <para>
         The Yocto Project files are maintained using Git in a "master" branch whose Git history 
         tracks every change and whose structure provides branches for all diverging functionality.
-        Although there is no need to use Git, many open source projects do so.
-        For the Yocto Project, a key individual called the "maintainer" is responsible for the "master"
-        branch of the Git repository.
+        Although there is no need to use Git, This practice is typical for open-source projects.
+        For the Yocto Project a key individual called the "maintainer" is responsible for "master".  
         The "master" branch is the “upstream” repository where the final builds of the project occur.  
         The maintainer is responsible for allowing changes in from other developers and for 
         organizing the underlying branch structure to reflect release strategies and so forth.  
-        <note>You can see who is the maintainer for Yocto Project files by examining the 
-        <filename>distro_tracking_fields.inc</filename> file in the Yocto Project
-        <filename>meta/conf/distro/include</filename> directory.</note>  
     </para>
 
     <para>
@@ -454,7 +394,7 @@
         Developers (including contributing community members) create and maintain cloned repositories 
         of the upstream "master" branch.  
         These repositories are local to their development platforms and are used to develop changes.  
-        When a developer is satisfied with a particular feature or change, they “push” the changes 
+        When a developer is satisfied with a particular feature or change they “push” the changes 
         to the appropriate "contrib" repository.
     </para>
 
@@ -477,7 +417,7 @@
         "master" branch of the Git repository, which is controlled by the project’s maintainer.  
         And, we have a set of developers who independently develop, test, and submit changes 
         to "contrib" areas for the maintainer to examine.  
-        The maintainer then chooses which changes are going to become a permanent part of the project.
+        The maintainer then chooses which changes are going to become permanently a part of the project.  
     </para>
 
     <para>
@@ -488,58 +428,55 @@
         While each development environment is unique, there are some best practices or methods 
         that help development run smoothly.  
         The following list describes some of these practices.  
-        For more information about Git workflows, see the workflow topics in the 
-        <ulink url='http://book.git-scm.com'>Git Community Book</ulink>. 
-        <itemizedlist>
-            <listitem><para><emphasis>Make Small Changes:</emphasis> It is best to keep the changes you commit
-                small as compared to bundling many disparate changes into a single commit.  
-                This practice not only keeps things manageable but also allows the maintainer 
-                to more easily include or refuse changes.</para>
-                <para>It is also good practice to leave the repository in a state that allows you to 
-                still successfully build your project.  In other words, do not commit half of a feature,
-                then add the other half in a separate, later commit.  
-                Each commit should take you from one buildable project state to another 
-                buildable state.</para></listitem>
-            <listitem><para><emphasis>Use Branches Liberally:</emphasis> It is very easy to create, use, and 
-                delete local branches in your working Git repository.  
-                You can name these branches anything you like.  
-                It is helpful to give them names associated with the particular feature or change 
-                on which you are working.  
-                Once you are done with a feature or change, simply discard the branch.</para></listitem>
-            <listitem><para><emphasis>Merge Changes:</emphasis> The <filename>git merge</filename>
-                command allows you to take the 
-                changes from one branch and fold them into another branch.  
-                This process is especially helpful when more than a single developer might be working 
-                on different parts of the same feature.  
-                Merging changes also automatically identifies any collisions or “conflicts” 
-                that might happen as a result of the same lines of code being altered by two different 
-                developers.</para></listitem>
-            <listitem><para><emphasis>Manage Branches:</emphasis> Because branches are easy to use, you should 
-                use a system where branches indicate varying levels of code readiness.  
-                For example, you can have a “work” branch to develop in, a “test” branch where the code or 
-                change is tested, a “stage” branch where changes are ready to be committed, and so forth.  
-                As your project develops, you can merge code across the branches to reflect ever-increasing 
-                stable states of the development.</para></listitem>
-            <listitem><para><emphasis>Use Push and Pull:</emphasis> The push-pull workflow is based on the 
-                concept of developers “pushing” local commits to a remote repository, which is 
-                usually a contribution repository.  
-                This workflow is also based on developers “pulling” known states of the project down into their 
-                local development repositories.  
-                The workflow easily allows you to pull changes submitted by other developers from the 
-                upstream repository into your work area ensuring that you have the most recent software 
-                on which to develop.
-                The Yocto Project has two scripts named <filename>create-pull-request</filename> and 
-                <filename>send-pull-request</filename> that ship with the release to facilitate this 
-                workflow.
-                You can find these scripts in the local Yocto Project files Git repository in
-                the <filename>scripts</filename> directory.</para></listitem>
-            <listitem><para><emphasis>Patch Workflow:</emphasis> This workflow allows you to notify the 
-                maintainer through an email that you have a change (or patch) you would like considered 
-                for the "master" branch of the Git repository.  
-                To send this type of change you format the patch and then send the email using the Git commands 
-                <filename>git format-patch</filename> and <filename>git send-email</filename>. 
-                You can find information on how to submit later in this chapter.</para></listitem>
-        </itemizedlist>
+        For more detailed information about these strategies see 
+        <ulink url='http://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html'>Git Workflows</ulink>. 
+    <itemizedlist>
+        <listitem><para><emphasis>Make Small Changes</emphasis> - It is best to keep your changes you commit 
+            small as compared to bundling many disparate changes into a single commit.  
+            This practice not only keeps things manageable but also allows the maintainer 
+            to more easily include or refuse changes.</para>
+            <para>It is also good practice to leave the repository in a state that allows you to 
+            still successfully build your project.</para></listitem>
+        <listitem><para><emphasis>Use Branches Liberally</emphasis> - It is very easy to create, use, and 
+            delete local branches in your working Git repository.  
+            You can name these branches anything you like.  
+            It is helpful to give them names associated with the particular feature or change 
+            on which you are working.  
+            Once you are done with a feature or change you simply discard the branch.</para></listitem>
+        <listitem><para><emphasis>Merge Changes</emphasis> - The <filename>git merge</filename>
+            command allows you to take the 
+            changes from one branch and fold them into another branch.  
+            This process is especially helpful when more than a single developer might be working 
+            on different parts of the same feature.  
+            Merging changes also automatically identifies any collisions or “conflicts” 
+            that might happen resulting from the same lines of code being altered by two different 
+            developers.</para></listitem>
+        <listitem><para><emphasis>Manage Branches</emphasis> - Because branches are easy to use, you should 
+            use a system where branches indicate varying levels of code readiness.  
+            For example, you can have a “work” branch to develop in, a “test” branch where the code or 
+            change is tested, a “stage” branch where changes are ready to be committed, and so forth.  
+            As your project develops, you can merge code across the branches to reflect ever-increasing 
+            stable states of the development.</para></listitem>
+        <listitem><para><emphasis>Use Push and Pull</emphasis> - The push-pull workflow is based on the 
+            concept of developers “pushing” local commits to a remote repository, which is 
+            usually a contribution repository.  
+            It is also based on the developers “pulling” known states of the project down into their 
+            local development repositories.  
+            This workflow easily allows you to pull changes submitted by other developers from the 
+            upstream repository into your work area ensuring that you have the most recent software 
+            on which to develop.
+            The Yocto Project has two scripts named <filename>create-pull-request</filename> and 
+            <filename>send-pull-request</filename> that ship with the release to facilitate this 
+            workflow.
+            You can find these scripts in the local Yocto Project files Git repository in
+            <filename>scripts</filename>.</para></listitem>
+        <listitem><para><emphasis>Patch Workflow</emphasis> - This workflow allows you to notify the 
+            maintainer through an email that you have a change (or patch) you would like considered 
+            for the "master" branch of the Git repository.  
+            To send this type of change you format the patch and then send the email using the Git commands 
+            <filename>git format-patch</filename> and <filename>git send-email</filename>. 
+            You can find information on how to submit later in this chapter.</para></listitem>
+    </itemizedlist>
     </para>
 </section>
 
@@ -547,59 +484,44 @@
     <title>Tracking Bugs</title>
 
     <para>
-        The Yocto Project uses its own implementation of 
-        <ulink url='http://www.bugzilla.org/about/'>Bugzilla</ulink> to track bugs.  
-        Implementations of Bugzilla work well for group development because they track bugs and code 
+        The Yocto Project uses <ulink url='http://www.bugzilla.org/about/'>Bugzilla</ulink> to track bugs.  
+        This bug-tracking application works well for group development because it tracks bugs and code 
         changes, can be used to communicate changes and problems with developers, can be used to 
-        submit and review patches, and can be used to manage quality assurance. 
-        The home page for the Yocto Project implementation of Bugzilla is   
-        <ulink url='&YOCTO_BUGZILLA_URL;'>&YOCTO_BUGZILLA_URL;</ulink>.
+        submit and review patches, and can be used to manage quality assurance.  
+        You can find a good overview of Bugzilla <ulink url='http://www.bugzilla.org/about/'>here</ulink>.     
     </para>
 
     <para>
         Sometimes it is helpful to submit, investigate, or track a bug against the Yocto Project itself
         such as when discovering an issue with some component of the build system that acts contrary 
-        to the documentation or your expectations.  
-        Following is the general procedure for submitting a new bug using the Yocto Project
-        Bugzilla.
-        You can find more information on defect management, bug tracking, and feature request
-        processes all accomplished through the Yocto Project Bugzilla on the wiki page
-        <ulink url='&YOCTO_WIKI_URL;/wiki/Bugzilla_Configuration_and_Bug_Tracking'>here</ulink>.     
-        <orderedlist>
-            <listitem><para>Always use the Yocto Project implementation of Bugzilla to submit
-                a bug.</para></listitem>
-            <listitem><para>When submitting a new bug, be sure to choose the appropriate
-                Classification, Product, and Component for which the issue was found.
-                Defects for Yocto Project fall into one of four classifications:  Yocto Projects, 
-                Infrastructure, Poky, and Yocto Metadata Layers.
-                Each of these Classifications break down into multiple Products and, in some 
-                cases, multiple Components.</para></listitem>
-            <listitem><para>Use the bug form to choose the correct Hardware and Architecture
-                for which the bug applies.</para></listitem>
-            <listitem><para>Indicate the Yocto Project version you were using when the issue
-                occurred.</para></listitem>
-            <listitem><para>Be sure to indicate the Severity of the bug.  
-                Severity communicates how the bug impacted your work.</para></listitem>
-            <listitem><para>Provide a brief summary of the issue. 
-                Try to limit your summary to just a line or two and be sure to capture the 
-                essence of the issue.</para></listitem>
-            <listitem><para>Provide a detailed description of the issue.  
-                You should provide as much detail as you can about the context, behavior, output, 
-                and so forth that surround the issue.  
-                You can even attach supporting files for output or log by using the "Add an attachment"
-                button.</para></listitem>
-            <listitem><para>Submit the bug by clicking the "Submit Bug" button.</para></listitem>
-        </orderedlist>
+        to the documentation or expectations.  
+        You can find information 
+        for Bugzilla configuration and bug tracking procedures specific to the Yocto Project 
+        <ulink url='https://wiki.yoctoproject.org/wiki/Bugzilla_Configuration_and_Bug_Tracking'>here</ulink>.     
+    </para>
+
+    <para>
+        The Yocto Project uses its own version of the Bugzilla application.  
+        You can find the home page <ulink url='http://bugzilla.yoctoproject.org'>here</ulink>.  
+        You need to use this implementation of Bugzilla when logging a defect against anything released 
+        by the Yocto Project team.     
+    </para>
+
+    <para>
+        Here are some things to remember when dealing with bugs against the Yocto Project:   
+    <itemizedlist>
+        <listitem><para>The Yocto Project follows a naming bug-naming convention: 
+            <filename>[YOCTO #&lt;number&gt;]</filename>, where <filename>&lt;number&gt;</filename> is the 
+            assigned defect ID used in Bugzilla.  
+            So, for example, a valid way to refer to a defect when creating a commit comment 
+            would be <filename>[YOCTO 1011]</filename>.   
+            This convention becomes important if you are submitting patches against the Yocto Project 
+            code itself.
+            See the following section for more information.</para></listitem>
+        <listitem><para>Defects for Yocto Project fall into one of four classifications:  Yocto Projects, 
+            Infrastructure, Poky, and Yocto Metadata Layers.</para></listitem>
+    </itemizedlist>
     </para>
- 
-    <note>
-        Bugs in the Yocto Project Bugzilla follow naming convention: 
-        <filename>[YOCTO #&lt;number&gt;]</filename>, where <filename>&lt;number&gt;</filename> is the 
-        assigned defect ID used in Bugzilla.  
-        So, for example, a valid way to refer to a defect would be <filename>[YOCTO #1011]</filename>.   
-        This convention becomes important if you are submitting patches against the Yocto Project 
-        code itself.
-    </note>
 </section>
 
 <section id='how-to-submit-a-change'>
@@ -607,36 +529,9 @@
 
     <para>
         Contributions to the Yocto Project are very welcome. 
-        Because the Yocto Project is extremely configurable and flexible, we recognize that developers 
-        will want to extend, configure or optimize it for their specific uses.
-        You should send patches to the appropriate Yocto Project mailing list to get them 
-        in front of the Yocto Project Maintainer.
-        For a list of the Yocto Project mailing lists, see the
-        "<ulink url='&YOCTO_DOCS_REF_URL;#resources-mailinglist'>Mailing lists</ulink>" section in 
-        The Yocto Project Reference Manual.
-    </para>
-
-    <para>
-        The following is some guidance on which mailing list to use for what type of defect:
-        <itemizedlist>
-            <listitem><para>For defects against the Yocto Project build system Poky, send 
-                your patch to the  
-                <ulink url='&YOCTO_LISTS_URL;/listinfo/poky'></ulink> mailing list. 
-                This mailing list corresponds to issues that are not specific to the Yocto Project but
-                are part of the OE-core.
-                For example, a defect against anything in the <filename>meta</filename> layer 
-                or the BitBake Manual could be sent to this mailing list.</para></listitem>
-            <listitem><para>For defects against Yocto-specific layers, tools, and Yocto Project 
-                documentation use the 
-                <ulink url='&YOCTO_LISTS_URL;/listinfo/yocto'></ulink> mailing list.
-                This mailing list corresponds to Yocto-specific areas such as 
-                <filename>meta-yocto</filename>, <filename>meta-intel</filename>, 
-                <filename>linux-yocto</filename>, and <filename>documentation</filename>.</para></listitem>
-        </itemizedlist>      
-    </para>
-
-    <para>  
-        When you send a patch, be sure to include a "Signed-off-by:"
+        You should send patches to the Yocto Project mailing list to get it in front of the 
+        Yocto Project Maintainer.  
+        When you send your patch, be sure to include a "signed-off-by:"
         line in the same style as required by the Linux kernel. 
         Adding this line signifies the developer has agreed to the Developer's Certificate of Origin 1.1
         as follows:
@@ -678,160 +573,66 @@
     <para>
         In a collaborative environment, it is necessary to have some sort of standard 
         or method through which you submit changes.  
-        Otherwise, things could get quite chaotic.
-        One general practice to follow is to make small, controlled changes to the 
-        Yocto Project.
-        Keeping changes small and isolated lets you best keep pace with future Yocto Project changes.
+        Otherwise, things would get quite chaotic.  
     </para>
 
     <para>
-        When you create a commit, you must follow certain standards established by the
-        Yocto Project development team. 
-        For each commit, you must provide a single-line summary of the change and you 
-        almost always provide a more detailed description of what you did (i.e. the body 
-        of the commit).
-        The only exceptions for not providing a detailed description would be if your 
-        change is a simple, self-explanatory change that needs no description.
-        Here are the Yocto Project commit message guidelines:
-        <itemizedlist>
-            <listitem><para>Provide a single-line, short summary of the change.
-                This summary is typically viewable by source control systems.
-                Thus, providing something short and descriptive that gives the reader 
-                a summary of the change is useful when viewing a list of many commits.
-                </para></listitem>
-            <listitem><para>For the body of the commit message, provide detailed information
-                that describes what you changed, why you made the change, and the approach
-                you used.  
-                Provide as much detail as you can in the body of the commit message.
-                </para></listitem>
-            <listitem><para>If the change addresses a specific bug or issue that is 
-                associated with a bug-tracking ID, prefix your detailed description
-                with the bug or issue ID.  
-                For example, the Yocto Project tracks bugs using a bug-naming convention.
-                Any commits that address a bug must start with the bug ID in the description
-                as follows:
-                <literallayout class='monospaced'>
-     YOCTO #&lt;bug-id&gt;:  &lt;Detailed description of commit&gt;
-                </literallayout></para></listitem>
-        </itemizedlist>
-    </para>
-
-    <para>
-        You can find more guidance on creating well-formed commit messages at this OpenEmbedded 
-        wiki page:
-        <ulink url='&OE_HOME_URL;/wiki/Commit_Patch_Message_Guidelines'></ulink>.
+        When you submit a change or patch to the Yocto Project, you must follow certain procedures.  
+        In particular, the headers in patches and the commit messages must follow a certain standard.  
+        The general process is the same as described earlier in this chapter.  
+        For complete details on how to create proper commit messages and patch headers see 
+        [WRITER NOTE:  I need the link to Mark's wiki page here that describes the process.]
     </para>
 
     <para>
         Following are general instructions for both pushing changes upstream and for submitting changes as patches.
-    </para> 
+    </para>
 
     <section id='pushing-a-change-upstream'>
-        <title>Pushing a Change Upstream and Requesting a Pull</title>
+        <title>Pushing a Change Upstream</title>
 
         <para>
             The basic flow for pushing a change to an upstream "contrib" Git repository is as follows:
-            <itemizedlist>
-                <listitem><para>Make your changes in your local Git repository.</para></listitem>
-                <listitem><para>Stage your commit (or change) by using the <filename>git add</filename>
-                    command.</para></listitem>
-                <listitem><para>Commit the change by using the <filename>git commit</filename>
-                    command and push it to the "contrib" repository.  
-                    Be sure to provide a commit message that follows the project’s commit standards
-                    as described earlier.</para></listitem>
-                <listitem><para>Notify the maintainer that you have pushed a change by making a pull 
-                    request.
-                    The Yocto Project provides two scripts that conveniently let you generate and send
-                    pull requests to the Yocto Project.
-                    These scripts are <filename>create-pull-request</filename> and 
-                    <filename>send-pull-request</filename>.
-                    You can find these scripts in the <filename>scripts</filename> directory of the 
-                    Yocto Project file structure.</para>
-                    <para>For help on using these scripts, simply provide the 
-                    <filename>--help</filename> argument as follows:
-                    <literallayout class='monospaced'>
-     $ ~/poky/scripts/create-pull-request --help
-     $ ~/poky/scripts/send-pull-request --help
-                    </literallayout></para></listitem>
-            </itemizedlist>
-        </para>
-
-        <para>            
-            You can find general Git information on how to push a change upstream in the 
-            <ulink url='http://book.git-scm.com/3_distributed_workflows.html'>Git Community Book</ulink>.
+        <itemizedlist>
+            <listitem><para>Make your changes in your local Git repository.</para></listitem>
+            <listitem><para>Stage your commit (or change) by using the <filename>git add</filename>
+                command.</para></listitem>
+            <listitem><para>Commit the change by using the <filename>git commit</filename>
+                command and push it to the upstream "contrib" repository.  
+                Be sure to provide a commit message that follows the project’s commit standards.</para></listitem>
+            <listitem><para>Notify the maintainer that you have pushed a change.</para></listitem>
+        </itemizedlist>
+            You can find general Git information on how to push a change upstream 
+            <ulink url='http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#Developing-With-git'>
+            here</ulink>.
         </para>
     </section>
 
     <section id='submitting-a-patch'>
-        <title>Submitting a Patch Through Email</title>
+        <title>Submitting a Patch</title>
 
         <para>
-            If you have a just a few changes, you can commit them and then submit them as an 
-            email to the maintainer.
+            If you have a just a few changes you can commit them and then submit them as an email to the maintainer.
             Here is a general procedure:
-            <itemizedlist>
-                <listitem><para>Make your changes in your local Git repository.</para></listitem>
-                <listitem><para>Stage your commit (or change) by using the <filename>git add</filename>
-                    command.</para></listitem>
-                <listitem><para>Commit the change by using the 
-                    <filename>git commit --signoff</filename> command.
-                    Using the <filename>--signoff</filename> option identifies you as the person 
-                    making the change and also satisfies the Developer's Certificate of 
-                    Origin (DCO) shown earlier.</para>
-                    <para>When you form a commit you must follow certain standards established by the 
-                    Yocto Project development team. 
-                    See the earlier section
-                    "<link linkend='how-to-submit-a-change'>How to Submit a Change</link>" 
-                    for Yocto Project commit message standards.</para></listitem>
-                <listitem><para>Format the commit into an email message.
-                    To format commits, use the <filename>git format-patch</filename> command.
-                    When you provide the command, you must include a revision list or a number of patches
-                    as part of the command.
-                    For example, these two commands each take the most recent single commit and 
-                    format it as an email message in the current directory:  
-                    <literallayout class='monospaced'>
-     $ git format-patch -1
-     $ git format-patch HEAD~
-                    </literallayout></para>
-                    <para>After the command is run, the current directory contains a 
-                    numbered <filename>.patch</filename> file for the commit.</para>
-                    <para>If you provide several commits as part of the command, 
-                    the <filename>git format-patch</filename> command produces a numbered 
-                    series of files in the current directory – one for each commit.
-                    If you have more than one patch, you should also use the 
-                    <filename>--cover</filename> option with the command, which generates a 
-                    cover letter as the first "patch" in the series.  
-                    You can then edit the cover letter to provide a description for 
-                    the series of patches.
-                    For information on the <filename>git format-patch</filename> command, 
-                    see <filename>GIT_FORMAT_PATCH(1)</filename> displayed using the  
-                    <filename>man git-format-patch</filename> command.</para></listitem>
-                <listitem><para>Import the files into your mail client by using the 
-                    <filename>git send-email</filename> command.
-                    <note>In order to use <filename>git send-email</filename>, you must have the 
-                    the proper Git packages installed.
-                    For Ubuntu and Fedora the package is <filename>git-email</filename>.</note></para>
-                    <para>The <filename>git send-email</filename> command sends email by using a local
-                    or remote Mail Transport Agent (MTA) such as 
-                    <filename>msmtp</filename>, <filename>sendmail</filename>, or through a direct
-                    <filename>smtp</filename> configuration in your Git <filename>config</filename>
-                    file.
-                    If you are submitting patches through email only, it is very important
-                    that you submit them without any whitespace or HTML formatting that 
-                    either you or your mailer introduces.
-                    The maintainer that receives your patches needs to be able to save and 
-                    apply them directly from your emails.
-                    A good way to verify that what you are sending will be applicable by the 
-                    maintainer is to do a dry run and send them to yourself and then 
-                    save and apply them as the maintainer would.</para>
-                    <para>The <filename>git send-email</filename> command is the preferred method
-                    for sending your patches since there is no risk of compromising whitespace
-                    in the body of the message, which can occur when you use your own mail client.
-                    The command also has several options that let you 
-                    specify recipients and perform further editing of the email message.
-                    For information on how to use the <filename>git send-email</filename> command,
-                    use the <filename>man git-send-email</filename> command.</para></listitem>
-            </itemizedlist>
+        <itemizedlist>
+            <listitem><para>Make your changes in your local Git repository.</para></listitem>
+            <listitem><para>Stage your commit (or change) by using the <filename>git add</filename>
+                command.</para></listitem>
+            <listitem><para>Commit the change by using the <filename>git commit</filename> command.  
+                Be sure to provide a commit message that follows the project’s commit standards.</para></listitem>
+            <listitem><para>Format the commit by using the <filename>git format-patch</filename>
+                command.  
+                This step produces a numbered series of files in the current directory – one for 
+                each commit.</para></listitem>
+            <listitem><para>Import the files into your mail client by using the 
+                <filename>git-send-email</filename> command.</para></listitem>
+            <listitem><para>Send the email by hand to the maintainer.</para></listitem>
+        </itemizedlist>
+             Be aware that there could be protocols and standards that you need to follow for your particular 
+             project.
+             You can find general Git information for submitting a patch  
+             <ulink url='http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#sharing-development'>
+             here</ulink>. 
         </para>
     </section>
 </section>

documentation/dev-manual/dev-manual-start.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='dev-manual-start'>
 
@@ -8,15 +7,16 @@
 
 <para>
     This chapter introduces the Yocto Project and gives you an idea of what you need to get started.  
-    You can find enough information to set up your development host and build or use images for 
-    hardware supported by the Yocto Project by reading  
-    <ulink url='&YOCTO_DOCS_QS_URL;'>
-    The Yocto Project Quick Start</ulink>.
+    You can find enough information to set your development host up and build or use images for 
+    hardware supported by the Yocto Project by reading the 
+    <ulink url='http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html'>
+    Yocto Project Quick Start</ulink> located on the <ulink url='http://www.yoctoproject.org'>
+    Yocto Project website</ulink>.
 </para>
 
 <para>
     The remainder of this chapter summarizes what is in the Yocto Project Quick Start and provides 
-    some higher-level concepts you might want to consider.
+    some higher level concepts you might want to consider.
 </para>
 
 <section id='introducing-the-yocto-project'>
@@ -24,28 +24,26 @@
 
     <para>
         The Yocto Project is an open-source collaboration project focused on embedded Linux development.  
-        The project currently provides a build system, which is sometimes referred to as "Poky",
-        and provides various ancillary tools suitable for the embedded developer.  
+        The project currently provides a build system and various ancillary tools suitable for the 
+        embedded developer.  
         The Yocto Project also features the Sato reference User Interface, which is optimized for 
         stylus driven, low-resolution screens.
     </para>
 
     <para>
-        You can use the Yocto Project build system, which uses 
-        <ulink url='http://bitbake.berlios.de/manual/'>BitBake</ulink>, to develop complete Linux 
+        You can use the Yocto Project, which uses the BitBake build tool, to develop complete Linux 
         images and associated user-space applications for architectures based on ARM, MIPS, PowerPC, 
         x86 and x86-64.  
         While the Yocto Project does not provide a strict testing framework,
         it does provide or generate for you artifacts that let you perform target-level and 
         emulated testing and debugging.  
-        Additionally, if you are an <trademark class='trade'>Eclipse</trademark>
-        IDE user, you can install an Eclipse Yocto Plug-in to allow you to 
+        And, if you are an Eclipse user, you can install an Eclipse Yocto Plug-in to allow you to 
         develop within that familiar environment.
     </para>
 </section>
 
 <section id='getting-setup'>
-    <title>Getting Set Up</title>
+    <title>Getting Setup</title>
 
     <para>
         Here is what you need to get set up to use the Yocto Project:
@@ -53,139 +51,125 @@
             <listitem><para><emphasis>Host System:</emphasis>  You should have a reasonably current 
                 Linux-based host system.
                 You will have the best results with a recent release of Fedora, 
-                OpenSUSE, or Ubuntu as these releases are frequently tested against the Yocto Project
-                and officially supported.  
+                OpenSUSE, or Ubuntu as these releases are frequently tested and officially supported 
+                host systems.  
                 You should also have about 100 gigabytes of free disk space for building images.
                 </para></listitem>
             <listitem><para><emphasis>Packages:</emphasis>  The Yocto Project requires certain packages
                 exist on your development system (e.g. Python 2.6 or 2.7).  
-                See "<ulink url='&YOCTO_DOCS_QS_URL;#packages'>The Packages</ulink>" 
-                section in the Yocto Project Quick start for the exact package 
-                requirements and the installation commands to install them 
-                for the supported distributions.</para></listitem>
+                See <ulink url='http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html#packages'>
+                The Packages</ulink> section in the Yocto Project Quick start for the exact package 
+                requirements and the installation commands for the supported distributions.</para></listitem>
             <listitem id='local-yp-release'><para><emphasis>Yocto Project Release:</emphasis>  
                 You need a release of the Yocto Project.  
                 You can get set up with local Yocto Project files one of two ways depending on whether you 
                 are going to be contributing back into the Yocto Project source repository or not.
                 <note>
-                    Regardless of the method you use, this manual refers to the resulting 
-                    hierarchical set of files as "the Yocto Project files" or "the Yocto Project file
-                    structure."
+                    Regardless of the method you use, this manual will refer to the resulting 
+                    hierarchical set of files as "the local Yocto Project files."
                 </note>
                 <itemizedlist>
                     <listitem><para><emphasis>Tarball Extraction:</emphasis>  If you are not going to contribute 
-                        back into the Yocto Project, you can simply download the Yocto Project release you want 
-                        from the website’s <ulink url='&YOCTO_HOME_URL;/download'>download page</ulink>.
+                        back into the Yocto Project you can simply download the Yocto Project release you want 
+                        from the website’s <ulink url='http://yoctoproject.org/download'>download page</ulink>.
                         Once you have the tarball, just extract it into a directory of your choice.</para>
-                        <para>For example, the following command extracts the Yocto Project &DISTRO; 
-                        release tarball 
-                        into the current working directory and sets up the Yocto Project file structure
-                        with a top-level directory named <filename>&YOCTO_POKY;</filename>:
-                        <literallayout class='monospaced'>
-     $ tar xfj &YOCTO_POKY_TARBALL;
-                        </literallayout></para>
-                        <para>This method does not produce a Git repository. 
-                        Instead, you simply end up with a local snapshot of the 
-                        Yocto Project files that are based on the particular release in the 
-                        tarball.</para></listitem>
+
+                        <para>For example, the following command extracts the Yocto Project 1.1 release tarball 
+                            into the current working directory and sets up a file structure whose top-level 
+                            directory is named <filename>poky-1.1</filename>:
+                            <literallayout class='monospaced'>
+     $ tar xfj poky-1.1.tar.bz2
+                            </literallayout></para>
+                        <para>This method does not produce a <filename>poky</filename> Git repository. 
+                            You end up simply with a local snapshot of Yocto Project files that are based on the 
+                            particular release in the tarball.</para></listitem>
                     <listitem><para><emphasis>Git Repository Method:</emphasis>  If you are going to be contributing
-                        back into the Yocto Project or you simply want to keep up
-                        with the latest developments, you should use Git commands to set up a local
-                        Git repository of the Yocto Project files.
+                        back into the Yocto Project you should use Git commands to set up a local 
+                        <filename>poky</filename> Git repository of the Yocto Project.  
                         Doing so creates a Git repository with a complete history of changes and allows 
-                        you to easily submit your changes upstream to the project.
-                        Because you cloned the repository, you have access to all the Yocto Project development
-                        branches and tag names used in the upstream repository.</para>
-                        <para>The following transcript shows how to clone the Yocto Project Files'  
-                        Git repository into the current working directory.
-                        <note>The name of the Yocto Project Files Git repository in the Yocto Project Files
-                        Source Repositories is <filename>poky</filename>.
-                        You can view the Yocto Project Source Repositories at
-                        <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink></note>  
-                        The command creates the local repository in a directory named <filename>poky</filename>.
-                        For information on Git used within the Yocto Project, see the
-                        "<link linkend='git'>Git</link>" section.
-                        <literallayout class='monospaced'>
+                        you to easily submit your changes upstream to the project.</para>
+ 
+                       <para>The following transcript shows how to clone the <filename>poky</filename> 
+                       Git repository into the current working directory.  
+                       The command creates the repository in a directory named <filename>poky</filename>.
+                       For information on the Yocto Project and Git, see
+                       <xref linkend='git'>Git</xref> in  
+                       <xref linkend='dev-manual-newbie'>Working with Open Source Code</xref>.
+                       <literallayout class='monospaced'>
      $ git clone git://git.yoctoproject.org/poky
      Initialized empty Git repository in /home/scottrif/poky/.git/
-     remote: Counting objects: 116882, done.
-     remote: Compressing objects: 100% (35987/35987), done.
-     remote: Total 116882 (delta 80651), reused 113045 (delta 77578)
-     Receiving objects: 100% (116882/116882), 72.13 MiB | 2.68 MiB/s, done.
-     Resolving deltas: 100% (80651/80651), done.                       </literallayout></para>
-                       <para>For another example of how to set up your own local Git repositories, see this
-                        <ulink url='&YOCTO_WIKI_URL;/wiki/Transcript:_from_git_checkout_to_meta-intel_BSP'>
+     remote: Counting objects: 107624, done.
+     remote: Compressing objects: 100% (37128/37128), done.
+     remote: Total 107624 (delta 73393), reused 99851 (delta 67287)
+     Receiving objects: 100% (107624/107624), 69.74 MiB | 483 KiB/s, done.
+     Resolving deltas: 100% (73393/73393), done.
+                       </literallayout></para>
+
+                       <para>For another example of how to set up your own local Git repositories see this
+                        <ulink url='https://wiki.yoctoproject.org/wiki/Transcript:_from_git_checkout_to_meta-intel_BSP'>
                         wiki page</ulink>, which describes how to create both <filename>poky</filename>
                         and <filename>meta-intel</filename> Git repositories.</para></listitem>
                 </itemizedlist></para></listitem>
             <listitem id='local-kernel-files'><para><emphasis>Linux Yocto Kernel:</emphasis>  
-                If you are going to be making modifications to a supported Linux Yocto kernel, you 
-                need to establish local copies of the source.
-                You can find Git repositories of supported Linux Yocto Kernels organized under
-                "Yocto Linux Kernel" in the Yocto Project Source Repositories at
-                <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>.</para>
-                <para>This setup involves creating a bare clone of the Linux Yocto kernel and then 
-                copying that cloned repository.
+                If you are going to be making modifications to a supported Linux Yocto kernel you 
+                need to get set up so that you can edit local copies of the source.
+                This setup involves creating a bare clone of the Linux Yocto kernel and then cloning 
+                that repository.
                 You can create the bare clone and the copy of the bare clone anywhere you like.
                 For simplicity, it is recommended that you create these structures outside of the 
-                Yocto Project files' Git repository.</para>
+                Yocto Project files Git repository.</para>
                 <para>As an example, the following transcript shows how to create the bare clone
-                of the <filename>linux-yocto-3.0-1.1.x</filename> kernel and then create a copy of 
+                of the <filename>linux-yocto-3.0</filename> kernel and then create a copy of 
                 that clone.
-                <note>When you have a local Linux Yocto kernel Git repository, you can 
-                reference that repository rather than the upstream Git repository as 
+                <note>If you currently have a local Linux Yocto kernel Git repository, you can 
+                reference this local repository rather than the upstream Git repository as 
                 part of the <filename>clone</filename> command.
-                Doing so can speed up the process.</note></para>
-                <para>In the following example, the bare clone is named 
-                <filename>linux-yocto-3.0-1.1.x.git</filename>, while the 
-                copy is named <filename>my-linux-yocto-3.0-1.1.x-work</filename>: 
+                Doing so can speed up the process.</note>
+                The bare clone is named <filename>linux-yocto-3.0.git</filename>, while the 
+                copy is named <filename>linux-yocto-3.0</filename>: 
                 <literallayout class='monospaced'>
-     $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0-1.1.x linux-yocto-3.0-1.1.x.git
-     Initialized empty Git repository in /home/scottrif/linux-yocto-3.0-1.1.x.git/
-     remote: Counting objects: 2259181, done.
-     remote: Compressing objects: 100% (373259/373259), done.
-     remote: Total 2259181 (delta 1892638), reused 2231556 (delta 1865300)
-     Receiving objects: 100% (2259181/2259181), 482.44 MiB | 580 KiB/s, done.
-     Resolving deltas: 100% (1892638/1892638), done.
+     $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.0 linux-yocto-3.0.git
+     Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0.git/
+     remote: Counting objects: 1886034, done.
+     remote: Compressing objects: 100% (314326/314326), done.
+     remote: Total 1886034 (delta 1570200), reused 1870337 (delta 1554798)
+     Receiving objects: 100% (1886034/1886034), 401.51 MiB | 3.27 MiB/s, done.
+     Resolving deltas: 100% (1570200/1570200), done.
                 </literallayout></para>
                 <para>Now create a clone of the bare clone just created:
                 <literallayout class='monospaced'>
-     $ git clone linux-yocto-3.0-1.1.x.git my-linux-yocto-3.0-1.1.x-work
-     Initialized empty Git repository in /home/scottrif/my-linux-yocto-3.0-1.1.x/.git/
-     Checking out files: 100% (36898/36898), done.
+     $ git clone linux-yocto-3.0.git linux-yocto-3.0
+     Initialized empty Git repository in /home/scottrif/poky/linux-yocto-3.0/.git/
+     Checking out files: 100% (35188/35188), done.
                 </literallayout></para></listitem>
             <listitem id='poky-extras-repo'><para><emphasis>
                 The <filename>poky-extras</filename> Git Repository</emphasis>:
-                The <filename>poky-extras</filename> Git repository contains metadata needed 
-                only if you are modifying and building the kernel image.
-                In particular, it contains the kernel BitBake append (<filename>.bbappend</filename>)
-                files that you 
-                edit to point to your locally modified kernel source files and to build the kernel
+                The <filename>poky-extras</filename> Git repository contains metadata needed to 
+                build the kernel image.
+                In particular, it contains the kernel <filename>.bbappend</filename> files that you 
+                edit to point to your locally modified kernel source files and to build kernel
                 image. 
                 Pointing to these local files is much more efficient than requiring a download of the 
                 source files from upstream each time you make changes to the kernel.</para>
-                <para>You can find the <filename>poky-extras</filename> Git Repository in the 
-                "Yocto Metadata Layers" area of the Yocto Project Source Repositories at 
-                <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>.
-                It is good practice to create this Git repository inside the Yocto Project
-                files Git repository.</para>
-                <para>Following is an example that creates the <filename>poky-extras</filename> Git 
+                <para>It is good practice to create this Git repository inside the Yocto Project
+                files Git repository.
+                Following is an example that creates the <filename>poky-extras</filename> Git 
                 repository inside the Yocto Project files Git repository, which is named 
                 <filename>poky</filename> in this case:
                 <literallayout class='monospaced'>
+     $ cd ~/poky
      $ git clone git://git.yoctoproject.org/poky-extras poky-extras
      Initialized empty Git repository in /home/scottrif/poky/poky-extras/.git/
-     remote: Counting objects: 561, done.
-     remote: Compressing objects: 100% (501/501), done.
-     remote: Total 561 (delta 159), reused 306 (delta 39)
-     Receiving objects: 100% (561/561), 519.96 KiB | 479 KiB/s, done.
-     Resolving deltas: 100% (159/159), done.
+     remote: Counting objects: 531, done.
+     remote: Compressing objects: 100% (471/471), done.
+     remote: Total 531 (delta 138), reused 307 (delta 39)
+     Receiving objects: 100% (531/531), 517.86 KiB, done.
+     Resolving deltas: 100% (138/138), done.
                 </literallayout></para></listitem>
-           <listitem><para><emphasis>Supported Board Support Packages (BSPs):</emphasis>  
-                Similar considerations exist for BSPs.  
+           <listitem><para><emphasis>Supported Board Support Packages (BSPs):</emphasis>  The same considerations 
+                exist for BSPs.  
                 You can get set up for BSP development one of two ways: tarball extraction or
                 with a local Git repository.
-                It is a good idea to use the same method used to set up the Yocto Project Files.
                 Regardless of the method you use, the Yocto Project uses the following BSP layer 
                 naming scheme:
                 <literallayout class='monospaced'> 
@@ -201,42 +185,41 @@
                 <itemizedlist>
                     <listitem><para><emphasis>Tarball Extraction:</emphasis>  You can download any released 
                         BSP tarball from the same 
-                        <ulink url='&YOCTO_HOME_URL;/download'>download site</ulink> used 
-                        to get the Yocto Project release.  
-                        Once you have the tarball, just extract it into a directory of your choice.
+                        <ulink url='http://yoctoproject.org/download'>download site</ulink>.  
+                        Once you have the tarball just extract it into a directory of your choice.
                         Again, this method just produces a snapshot of the BSP layer in the form
                         of a hierarchical directory structure.</para></listitem>
                     <listitem><para><emphasis>Git Repository Method:</emphasis>  If you are working 
-                        with a Yocto Project Files Git repository, you should also use this method 
-                        to set up the <filename>meta-intel</filename> Git repository.
-                        You can locate the <filename>meta-intel</filename> Git repository in the 
-                        "Yocto Metadata Layers" area of the Yocto Project Source Repositories at
-                        <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>.</para>
-                        <para>Typically, you set up the <filename>meta-intel</filename> Git repository inside
-                        the Yocto Project Files Git repository.
-                        For example, the following transcript shows the steps to clone the 
+                        with a <filename>poky</filename> Git repository you should also set up a 
+                        <filename>meta-intel</filename> Git repository.  
+                        Typically, you set up the <filename>meta-intel</filename> Git repository inside
+                        the <filename>poky</filename> Git repository.</para>
+
+                        <para>For example, the following transcript shows the steps to clone the 
                         <filename>meta-intel</filename>
                         Git repository inside the <filename>poky</filename> Git repository.
                         <literallayout class='monospaced'>
+     $cd poky
      $ git clone git://git.yoctoproject.org/meta-intel.git
      Initialized empty Git repository in /home/scottrif/poky/meta-intel/.git/
-     remote: Counting objects: 3279, done.
-     remote: Compressing objects: 100% (2708/2708), done.
-     remote: Total 3279 (delta 1761), reused 194 (delta 105)
-     Receiving objects: 100% (3279/3279), 1.75 MiB | 377 KiB/s, done.
-     Resolving deltas: 100% (1761/1761), done.
+     remote: Counting objects: 1325, done.
+     remote: Compressing objects: 100% (1078/1078), done.
+     remote: Total 1325 (delta 546), reused 85 (delta 27)
+     Receiving objects: 100% (1325/1325), 1.56 MiB | 330 KiB/s, done.
+     Resolving deltas: 100% (546/546), done.
                         </literallayout></para>
+
                         <para>The same  
-                        <ulink url='&YOCTO_WIKI_URL;/wiki/Transcript:_from_git_checkout_to_meta-intel_BSP'>
+                        <ulink url='https://wiki.yoctoproject.org/wiki/Transcript:_from_git_checkout_to_meta-intel_BSP'>
                         wiki page</ulink> referenced earlier covers how to 
                         set up the <filename>meta-intel</filename> Git repository.</para></listitem>
                 </itemizedlist></para></listitem>
             <listitem><para><emphasis>Eclipse Yocto Plug-in:</emphasis>  If you are developing 
-                applications using the Eclipse Integrated Development Environment (IDE),
-                you will need this plug-in.  
+                applications using the 
+                Eclipse Integrated Development Environment (IDE) you will need this plug-in.  
                 See the 
-                "<ulink url='&YOCTO_DOCS_ADT_URL;#setting-up-the-eclipse-ide'>Setting up the Eclipse IDE</ulink>"
-                section in the Yocto Application Development Toolkit (ADT) 
+                <ulink url='http://www.yoctoproject.org/docs/adt-manual/adt-manual.html#setting-up-the-eclipse-ide'>
+                Setting up the Eclipse IDE</ulink> section in the Yocto Application Development Toolkit (ADT) 
                 User’s Guide for more information.</para></listitem>
         </itemizedlist>
     </para>
@@ -248,8 +231,8 @@
     <para>
         The build process creates an entire Linux distribution, including the toolchain, from source.  
         For more information on this topic, see the 
-        "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>"
-        section in the Yocto Project Quick Start.
+        <ulink url='http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html#building-image'>
+        Building an Image</ulink> section in the Yocto Project Quick Start.
     </para>
 
     <para>
@@ -259,20 +242,12 @@
                 previous section.</para></listitem>
             <listitem><para>Initialize the build environment by sourcing a build environment 
                 script.</para></listitem>
-            <listitem><para>Optionally ensure the <filename>/conf/local.conf</filename> configuration file, 
-                which is found in the Yocto Project build directory, 
-                is set up how you want it.  
-                This file defines many aspects of the build environment including 
-                the target machine architecture through the 
-                <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'>MACHINE</ulink></filename> variable, 
-                the development machine's processor use through the 
-                <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-BB_NUMBER_THREADS'>BB_NUMBER_THREADS</ulink></filename> and 
-                <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PARALLEL_MAKE'>PARALLEL_MAKE</ulink></filename> variables, and
-                a centralized tarball download directory through the  
-                <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-DL_DIR'>DL_DIR</ulink></filename> variable.</para></listitem>
-            <listitem><para>Build the image using the <filename>bitbake</filename> command.
-                If you want information on BitBake, see the user manual at
-                <ulink url='&OE_DOCS_URL;/bitbake/html'></ulink>.</para></listitem>
+            <listitem><para>Optionally ensure the <filename>conf/local.conf</filename> configuration file is set 
+                up how you want it.  
+                This file defines the target machine architecture and and other build options.</para></listitem>
+            <listitem><para>Build the image using the BitBake command.  
+                If you want information on Bitbake, see the user manual at 
+                <ulink url='http://docs.openembedded.org/bitbake/html'></ulink>.</para></listitem>
             <listitem><para>Run the image either on the actual hardware or using the QEMU 
                 emulator.</para></listitem>
         </orderedlist>
@@ -283,38 +258,18 @@
     <title>Using Pre-Built Binaries and QEMU</title>
 
     <para>
-        Another option you have to get started is to use pre-built binaries. 
-        The Yocto Project provides many types of binaries with each release. 
-        See the <ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink>
-        section for descriptions of the types of binaries that ship with a Yocto Project
-        release.
+        Another option you have to get started is to use pre-built binaries.  
+        This scenario is ideal for developing software applications to run on your target hardware.  
+        To do this you need to install the stand-alone Yocto toolchain tarball and then download the 
+        pre-built kernel that you will boot using the QEMU emulator.  
+        Next, you must download the filesystem for your target machine’s architecture.  
+        Finally, you set up the environment to emulate the hardware then start the emulator.
     </para>
 
     <para>
-        Using a pre-built binary is ideal for developing software applications to run on your 
-        target hardware.  
-        To do this, you need to be able to access the appropriate cross-toolchain tarball for 
-        the architecture on which you are developing.  
-        If you are using an SDK type image, the image ships with the complete toolchain native to 
-        the architecture. 
-        If you are not using an SDK type image, you need to separately download and 
-        install the stand-alone Yocto Project cross-toolchain tarball.
-    </para>
-
-    <para>
-        Regardless of the type of image you are using, you need to download the pre-built kernel 
-        that you will boot in the QEMU emulator and then download and extract the target root 
-        filesystem for your target machine’s architecture.
-        You can get architecture-specific binaries and filesystem from
-        <ulink url='&YOCTO_MACHINES_DL_URL;'>machines</ulink>.
-        You can get stand-alone toolchains from
-        <ulink url='&YOCTO_TOOLCHAIN_DL_URL;'>toolchains</ulink>.
-        Once you have all your files, you set up the environment to emulate the hardware 
-        by sourcing an environment setup script. 
-        Finally, you start the QEMU emulator.
         You can find details on all these steps in the 
-        "<ulink url='&YOCTO_DOCS_QS_URL;#using-pre-built'>Using Pre-Built Binaries and QEMU</ulink>"
-        section of the Yocto Project Quick Start. 
+        <ulink url='http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html#using-pre-built'>
+        Using Pre-Built Binaries and QEMU</ulink> section in the Yocto Project Quick Start. 
     </para>
 </section>
 </chapter>

documentation/dev-manual/dev-manual.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <book id='dev-manual' lang='en' 
       xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -31,23 +30,14 @@
         <revhistory>
             <revision>
                 <revnumber>1.1</revnumber>
-                <date>6 October 2011</date>
-                <revremark>The initial document released with the Yocto Project 1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.1</revnumber>
-                <date>15 March 2012</date>
-                <revremark>Released with the Yocto Project 1.1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.2</revnumber>
-                <date>July 2012</date>
-                <revremark>Released with the Yocto Project 1.1.2 Release.</revremark>
+                <date>TBD 2011</date>
+                <revremark>This revision is the initial document draft and corresponds with 
+                    the Yocto Project 1.1 Release.</revremark>
             </revision>
         </revhistory>
 
     <copyright>
-     <year>&COPYRIGHT_YEAR;</year>
+     <year>2010-2011</year>
       <holder>Linux Foundation</holder>
     </copyright>
 
@@ -62,9 +52,9 @@
       <note>
           Due to production processes, there could be differences between the Yocto Project
           documentation bundled in the release tarball and  
-          <ulink url='&YOCTO_DOCS_DEV_URL;'>
+          <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
           The Yocto Project Development Manual</ulink> on
-          the <ulink url='&YOCTO_HOME_URL;'>Yocto Project</ulink> website.
+          the <ulink url='http://www.yoctoproject.org'>Yocto Project</ulink> website.
           For the latest version of this manual, see the manual on the website.
       </note>
     </legalnotice>

documentation/dev-manual/style.css

@@ -654,7 +654,7 @@ hr {
 
 
 .tip, .warning, .caution, .note {
-  border-color: #fff;
+  border-color: #aaa;
 }
 
 
@@ -662,24 +662,24 @@ hr {
 .warning table th,
 .caution table th,
 .note table th {
-  border-bottom-color: #fff;
+  border-bottom-color: #aaa;
 }
 
 
 .warning {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .caution {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .tip {
-  background-color: #f0f0f2;
+  background-color: #eff;
 }
 
 .note {
-  background-color: #f0f0f2; 
+  background-color: #dfc;
 }
 
 .glossary dl dt, 
@@ -946,8 +946,8 @@ table {
 
 .tip,
 .note {
-   background: #f0f0f2; 
-   color: #333;   
+   background: #666666;
+   color: #fff;   
    padding: 20px;
    margin: 20px;
 }
@@ -958,26 +958,11 @@ table {
    margin: 0em;
    font-size: 2em;
    font-weight: bold;
-   color: #333;   
+   color: #fff;   
 }
 
 .tip a,
 .note a {
-   color: #333;   
+   color: #fff;   
    text-decoration: underline;
 }
-
-.footnote {
-   font-size: small;
-   color: #333;
-}
-
-/* Changes the announcement text */
-.tip h3,
-.warning h3,
-.caution h3,
-.note h3 {
-   font-size:large;
-   color: #00557D;
-}
-

documentation/kernel-manual/kernel-concepts.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='kernel-concepts'>
 
@@ -45,16 +44,14 @@
             management techniques.</para></listitem>
             <listitem><para>Deliver the most up-to-date kernel possible while still ensuring that 
             the baseline kernel is the most stable official release.</para></listitem>
-            <listitem><para>Include major technological features as part of Yocto Project's 
-            upward revision strategy.</para></listitem>
-            <listitem><para>Present a kernel Git repository that, similar to the upstream 
-            <filename>kernel.org</filename> tree, 
-            has a clear and continuous history.</para></listitem>
+            <listitem><para>Include major technological features as part of Yocto Project's up-rev 
+            strategy.</para></listitem>
+            <listitem><para>Present a Git tree, that just like the upstream kernel.org tree, has a 
+            clear and continuous history.</para></listitem>
             <listitem><para>Deliver a key set of supported kernel types, where each type is tailored 
-            to meet a specific use (e.g. networking, consumer, devices, and so forth).</para></listitem>
-            <listitem><para>Employ a Git branching strategy that, from a developer's point of view,
-            results in a linear path from the baseline <filename>kernel.org</filename>, 
-            through a select group of features and
+            to a specific use case (i.e. networking, consumer, devices, and so forth).</para></listitem>
+            <listitem><para>Employ a Git branching strategy that from a customer's point of view
+            results in a linear path from the baseline kernel.org, through a select group of features and
             ends with their BSP-specific commits.</para></listitem>
         </itemizedlist>
         </para>
@@ -63,29 +60,27 @@
     <section id='kernel-big-picture'>
         <title>Yocto Project Kernel Development and Maintenance Overview</title>
         <para>
-            The Yocto Project kernel, like other kernels, is based off the Linux kernel release
+            Yocto Project kernel, like other kernels, is based off the Linux kernel release
             from <ulink url='http://www.kernel.org'></ulink>.  
-            At the beginning of a major development cycle, the Yocto Project team
-            chooses its Yocto Project kernel 
-            based on factors like release timing, the anticipated release timing of final
-            upstream <filename>kernel.org</filename> versions, and Yocto Project feature requirements.
-            Typically, the kernel chosen is in the
-            final stages of development by the community.
-            In other words, the kernel is in the release
-            candidate or "rc" phase and not yet a final release. 
-            But, by being in the final stages of external development, the team knows that the 
-            <filename>kernel.org</filename> final release will clearly be within the early stages of 
+            At the beginning of our major development cycle, we choose our Yocto Project kernel 
+            based on factors like release timing, the anticipated release timing of "final" (i.e. non "rc")
+            upstream kernel.org versions, and Yocto Project feature requirements.
+            Typically this will be a kernel that is in the
+            final stages of development by the community (i.e. still in the release
+            candidate or "rc" phase) and not yet a final release. 
+            But by being in the final stages of external development, we know that the 
+            kernel.org final release will clearly land within the early stages of 
             the Yocto Project development window.
         </para>
         <para>
-            This balance allows the team to deliver the most up-to-date kernel
-            as possible, while still ensuring that the team has a stable official release for
-            the baseline kernel version.
+            This balance allows us to deliver the most up-to-date kernel
+            as possible, while still ensuring that we have a stable official release as
+            our baseline kernel version.
         </para>
         <para>
             The ultimate source for the Yocto Project kernel is a released kernel 
-            from <filename>kernel.org</filename>.
-            In addition to a foundational kernel from <filename>kernel.org</filename>, the released 
+            from kernel.org.
+            In addition to a foundational kernel from kernel.org the released 
             Yocto Project kernel contains a mix of important new mainline
             developments, non-mainline developments (when there is no alternative),
             Board Support Package (BSP) developments,
@@ -93,21 +88,37 @@
             These additions result in a commercially released Yocto Project kernel that caters 
             to specific embedded designer needs for targeted hardware.
         </para>
+<!--        <para>
+            The following figure represents the overall place the Yocto Project kernel fills.
+        </para>
         <para>
-            Once a Yocto Project kernel is officially released, the Yocto Project team goes into 
-            their next development cycle, or upward revision (uprev) cycle, while still 
-            continuing maintenance on the released kernel.
+        <imagedata fileref="figures/kernel-big-picture.png" width="6in" depth="6in" align="center" scale="100" />
+        </para>
+        <para>
+            In the figure the ultimate source for the Yocto Project kernel is a released kernel 
+            from kernel.org.
+            In addition to a foundational kernel from kernel.org the commercially released 
+            Yocto Project kernel contains a mix of important new mainline
+            developments, non-mainline developments, Board Support Package (BSP) developments,
+            and custom features.
+            These additions result in a commercially released Yocto Project kernel that caters 
+            to specific embedded designer needs for targeted hardware. 
+        </para> -->
+        <para>
+            Once a Yocto Project kernel is officially released the Yocto Project team goes into 
+            their next development cycle, or "uprev" cycle while continuing maintenance on the 
+            released kernel.
             It is important to note that the most sustainable and stable way
             to include feature development upstream is through a kernel uprev process.
-            Back-porting hundreds of individual fixes and minor features from various
-            kernel versions is not sustainable and can easily compromise quality.
-        </para>
-        <para> 
+            Back-porting of hundreds of individual fixes and minor features from various
+            kernel versions is not sustainable and can easily compromise quality. 
             During the uprev cycle, the Yocto Project team uses an ongoing analysis of
             kernel development, BSP support, and release timing to select the best
-            possible <filename>kernel.org</filename> version.
+            possible kernel.org version.
             The team continually monitors community kernel
             development to look for significant features of interest.
+<!--            The illustration depicts this by showing the team looking back to kernel.org for new features, 
+            BSP features, and significant bug fixes. -->
             The team does consider back-porting large features if they have a significant advantage. 
             User or community demand can also trigger a back-port or creation of new
             functionality in the Yocto Project baseline kernel during the uprev cycle. 
@@ -119,7 +130,7 @@
             It is the Yocto Project team's policy to not back-port minor features to the released kernel. 
             They only consider back-porting significant technological jumps - and, that is done 
             after a complete gap analysis. 
-            The reason for this policy is that back-porting any small to medium sized change 
+            The reason for this policy is that simply back-porting any small to medium sized change 
             from an evolving kernel can easily create mismatches, incompatibilities and very 
             subtle errors.
         </para>
@@ -149,26 +160,21 @@
         <section id='architecture-overview'>
             <title>Overview</title>
             <para>
-                As mentioned earlier, a key goal of the Yocto Project is to present the 
-                developer with 
+                As mentioned earlier, a key goal of Yocto Project is to present the developer with 
                 a kernel that has a clear and continuous history that is visible to the user. 
                 The architecture and mechanisms used achieve that goal in a manner similar to the 
-                upstream <filename>kernel.org</filename>.
+                upstream kernel.org.
+                
             </para>
             <para>
                 You can think of the Yocto Project kernel as consisting of a baseline kernel with
                 added features logically structured on top of the baseline.
                 The features are tagged and organized by way of a branching strategy implemented by the 
-                source code manager (SCM) Git.
-                For information on Git as applied to the Yocto Project, see the
-                "<ulink url='&YOCTO_DOCS_DEV_URL;#git'>Git</ulink>" section in the 
-                Yocto Project Development Manual.
-            </para>
-            <para>
+                source code manager (SCM) Git. 
                 The result is that the user has the ability to see the added features and 
                 the commits that make up those features.
                 In addition to being able to see added features, the user can also view the history of what 
-                made up the baseline kernel.
+                made up the baseline kernel as well.
             </para>
             <para>
                 The following illustration shows the conceptual Yocto Project kernel.
@@ -177,20 +183,18 @@
                 <imagedata fileref="figures/kernel-architecture-overview.png" width="6in" depth="7in" align="center" scale="100" />
             </para>
             <para>
-                In the illustration, the "Kernel.org Branch Point" 
-                marks the specific spot (or release) from 
-                which the Yocto Project kernel is created.  
-                From this point "up" in the tree, features and differences are organized and tagged.
+                In the illustration, the "kernel.org Branch Point" marks the specific spot (or release) from 
+                which the Yocto Project kernel is created.  From this point "up" in the tree features and 
+                differences are organized and tagged.
             </para>
             <para>
                 The "Yocto Project Baseline Kernel" contains functionality that is common to every kernel
-                type and BSP that is organized further up the tree.  
-                Placing these common features in the 
+                type and BSP that is organized further up the tree.  Placing these common features in the 
                 tree this way means features don't have to be duplicated along individual branches of the 
                 structure.
             </para>
             <para>
-                From the Yocto Project Baseline Kernel, branch points represent specific functionality
+                From the Yocto Project Baseline Kernel branch points represent specific functionality
                 for individual BSPs as well as real-time kernels.
                 The illustration represents this through three BSP-specific branches and a real-time 
                 kernel branch.  
@@ -205,9 +209,8 @@
                 kernel as they apply to a given BSP.
             </para>
             <para>
-                The resulting tree structure presents a clear path of markers (or branches) to the 
-                developer that, for all practical purposes, is the kernel needed for any given set 
-                of requirements.
+                The resulting tree structure presents a clear path of markers (or branches) to the user
+                that for all practical purposes is the kernel needed for any given set of requirements.
             </para>
         </section>
  
@@ -218,52 +221,50 @@
                 no longer shared and thus, needs to be isolated.
                 For example, board-specific incompatibilities would require different functionality
                 and would require a branch to separate the features. 
-                Likewise, for specific kernel features, the same branching strategy is used.
-            </para>
-            <para>
+                Likewise, for specific kernel features the same branching strategy is used.
                 This branching strategy results in a tree that has features organized to be specific 
                 for particular functionality, single kernel types, or a subset of kernel types.  
-                This strategy also results in not having to store the same feature twice 
-                internally in the tree.
-                Rather, the kernel team stores the unique differences required to apply the 
-                feature onto the kernel type in question.
-                <note>
-                    The Yocto Project team strives to place features in the tree such that they can be 
-                    shared by all boards and kernel types where possible.
-                    However, during development cycles or when large features are merged,
-                    the team cannot always follow this practice. 
-                    In those cases, the team uses isolated branches to merge features.
-                </note>
+                This strategy results in not having to store the same feature twice internally in the 
+                tree.
+                Rather we store the unique differences required to apply the feature onto the kernel type 
+                in question.
             </para>
+            <note><para>
+                The Yocto Project team strives to place features in the tree such that they can be 
+                shared by all boards and kernel types where possible.
+                However, during development cycles or when large features are merged this practice 
+                cannot always be followed. 
+                In those cases isolated branches are used for feature merging.
+            </para></note>
             <para>
                 BSP-specific code additions are handled in a similar manner to kernel-specific additions. 
                 Some BSPs only make sense given certain kernel types.
-                So, for these types, the team creates branches off the end of that kernel type for all 
+                So, for these types, we create branches off the end of that kernel type for all 
                 of the BSPs that are supported on that kernel type.  
                 From the perspective of the tools that create the BSP branch, the BSP is really no 
                 different than a feature.
                 Consequently, the same branching strategy applies to BSPs as it does to features.
-                So again, rather than store the BSP twice, the team only stores the unique 
-                differences for the BSP across the supported multiple kernels.
+                So again, rather than store the BSP twice, only the unique differences for the BSP across
+                the supported multiple kernels are uniquely stored.
             </para>
             <para>
                 While this strategy can result in a tree with a significant number of branches, it is
-                important to realize that from the developer's point of view, there is a linear
-                path that travels from the baseline <filename>kernel.org</filename>, through a select
-                group of features and ends with their BSP-specific commits.
+                important to realize that from the user's point of view, there is a linear
+                path that travels from the baseline kernel.org, through a select group of features and
+                ends with their BSP-specific commits.
                 In other words, the divisions of the kernel are transparent and are not relevant 
                 to the developer on a day-to-day basis.  
-                From the developer's perspective, this path is the "master" branch.
-                The developer does not need not be aware of the existence of any other branches at all.  
-                Of course, there is value in the existence of these branches
+                From the user's perspective, this is the "master" branch.
+                They do not need not be aware of the existence of any other branches at all.  
+                Of course there is value in the existence of these branches
                 in the tree, should a person decide to explore them. 
                 For example, a comparison between two BSPs at either the commit level or at the line-by-line 
-                code <filename>diff</filename> level is now a trivial operation.
+                code diff level is now a trivial operation.
             </para>
             <para>
                 Working with the kernel as a structured tree follows recognized community best practices. 
-                In particular, the kernel as shipped with the product, should be
-                considered an "upstream source" and viewed as a series of
+                In particular, the kernel as shipped with the product should be
+                considered an 'upstream source' and viewed as a series of
                 historical and documented modifications (commits). 
                 These modifications represent the development and stabilization done
                 by the Yocto Project kernel development team.
@@ -272,7 +273,7 @@
                 Because commits only change at significant release points in the product life cycle,
                 developers can work on a branch created
                 from the last relevant commit in the shipped Yocto Project kernel. 
-                As mentioned previously, the structure is transparent to the developer
+                As mentioned previously, the structure is transparent to the user
                 because the kernel tree is left in this state after cloning and building the kernel.
             </para>
         </section>
@@ -280,25 +281,20 @@
         <section id='source-code-manager-git'>
             <title>Source Code Manager - Git</title>
             <para>
-                The Source Code Manager (SCM) is Git.
-                This SCM is the obvious mechanism for meeting the previously mentioned goals.  
-                Not only is it the SCM for <filename>kernel.org</filename> but,
-                Git continues to grow in popularity and supports many different work flows, 
-                front-ends and management techniques.
+                The Source Code Manager (SCM) is Git and it is the obvious mechanism for meeting the 
+                previously mentioned goals.  
+                Not only is it the SCM for kernel.org but Git continues to grow in popularity and
+                supports many different work flows, front-ends and management techniques.
             </para>
             <para>
                 You can find documentation on Git at <ulink url='http://git-scm.com/documentation'></ulink>.
-                You can also get an introduction to Git as it applies to the Yocto Project in the
-                "<ulink url='&YOCTO_DOCS_DEV_URL;#git'>Git</ulink>"
-                section in the Yocto Project Development Manual. 
-                These referenced sections overview Git and describe a minimal set of 
-                commands that allow you to be functional using Git.
-                <note>
-                    You can use as much, or as little, of what Git has to offer to accomplish what
-                    you need for your project.
-                    You do not have to be a "Git Master" in order to use it with the Yocto Project.
-                </note>
+                Also, the Yocto Project Development manual has an introduction to Git and describes a 
+                minimal set of commands that allow you to be functional with Git.
             </para>
+            <note><para> 
+                It should be noted that you can use as much, or as little, of what Git has to offer 
+                as is appropriate to your project.
+            </para></note>
         </section>
     </section>
 
@@ -311,19 +307,17 @@
             present a simplified view of the kernel for ease of use.
         </para>
         <para>
-            Fundamentally, the kernel tools that manage and construct the
-            Yocto Project kernel accomplish the following:
+            The fundamental properties of the tools that manage and construct the
+            Yocto Project kernel are:
             <itemizedlist>
                 <listitem><para>Group patches into named, reusable features.</para></listitem>
-                <listitem><para>Allow top-down control of included features.</para></listitem>
-                <listitem><para>Bind kernel configurations to kernel patches and features.</para></listitem>
+                <listitem><para>Allow top down control of included features.</para></listitem>
+                <listitem><para>Bind kernel configuration to kernel patches and features.</para></listitem>
                 <listitem><para>Present a seamless Git repository that blends Yocto Project value 
-                    with the <filename>kernel.org</filename> history and development.</para></listitem>
+                    with the kernel.org history and development.</para></listitem>
             </itemizedlist>
         </para>
 <!--<para>
-WRITER NOTE: Put this in for post 1.1 if possible:
-
 The tools that construct a kernel tree will be discussed later in this 
 document. The following tools form the foundation of the Yocto Project 
 kernel toolkit:
@@ -336,6 +330,11 @@ kernel toolkit:
 </itemizedlist>
 </para> -->
     </section> 
+
+
+
+
+
 </chapter>
 <!--
 vim: expandtab tw=80 ts=4

documentation/kernel-manual/kernel-doc-intro.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='kernel-doc-intro'>
 
@@ -12,7 +11,7 @@
         The Yocto Project presents the kernel as a fully patched, history-clean Git
         repository. 
         The Git tree represents the selected features, board support,
-        and configurations extensively tested by the Yocto Project. 
+        and configurations extensively tested by Yocto Project. 
         The Yocto Project kernel allows the end user to leverage community
         best practices to seamlessly manage the development, build and debug cycles.
     </para>
@@ -21,47 +20,28 @@
         on its history, organization, benefits, and use.
         The manual consists of two sections:
         <itemizedlist>
-            <listitem><para><emphasis>Concepts:</emphasis> Describes concepts behind the kernel.
+            <listitem><para>Concepts - Describes concepts behind the kernel.
                 You will understand how the kernel is organized and why it is organized in 
                 the way it is.  You will understand the benefits of the kernel's organization 
                 and the mechanisms used to work with the kernel and how to apply it in your 
                 design process.</para></listitem>
-            <listitem><para><emphasis>Using the Kernel:</emphasis> Describes best practices 
-                and "how-to" information
-                that lets you put the kernel to practical use.  
-                Some examples are how to examine changes in a branch and how to 
-                save kernel modifications.</para></listitem>
+            <listitem><para>Using the Kernel - Describes best practices and "how-to" information
+                that lets you put the kernel to practical use.  Some examples are "How to Build a 
+                Project Specific Tree", "How to Examine Changes in a Branch", and "Saving Kernel
+                Modifications."</para></listitem>
         </itemizedlist>
     </para>
-
     <para>
-        For more information on the Linux kernel, see the following links:
+        For more information on the kernel, see the following links:
         <itemizedlist>
-            <listitem><para>The Linux Foundation's guide for kernel development
-                process - <ulink url='http://ldn.linuxfoundation.org/book/1-a-guide-kernel-development-process'></ulink></para></listitem>
-<!--            <listitem><para><ulink url='http://userweb.kernel.org/~akpm/stuff/tpp.txt'></ulink></para></listitem> -->
-            <listitem><para>A fairly emcompassing guide on Linux kernel development - 
-                <ulink url='http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/HOWTO;hb=HEAD'></ulink></para></listitem> 
+            <listitem><para><ulink url='http://ldn.linuxfoundation.org/book/1-a-guide-kernel-development-process'></ulink></para></listitem>
+            <listitem><para><ulink url='http://userweb.kernel.org/~akpm/stuff/tpp.txt'></ulink></para></listitem>
+            <listitem><para><ulink url='http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/HOWTO;hb=HEAD'></ulink></para></listitem> 
         </itemizedlist>
-    </para>
-
-    <para>
-        For more discussion on the Yocto Project kernel, you can see these sections
-        in <ulink url='&YOCTO_DOCS_DEV_URL;'>The Yocto Project Development Manual</ulink>:
-        <itemizedlist>
-            <listitem><para>
-                "<ulink url='&YOCTO_DOCS_DEV_URL;#kernel-overview'>Kernel Overview</ulink>"</para></listitem>
-            <listitem><para>
-                "<ulink url='&YOCTO_DOCS_DEV_URL;#kernel-modification-workflow'>Kernel Modification Workflow</ulink>"
-                </para></listitem>
-            <listitem><para> 
-                "<ulink url='&YOCTO_DOCS_DEV_URL;#dev-manual-kernel-appendix'>Kernel Modification Example</ulink>"</para></listitem>
-        </itemizedlist>
-    </para>
-
-    <para> 
-        For general information on the Yocto Project, visit the website at
-        <ulink url='&YOCTO_HOME_URL;'></ulink>.
+        <para> 
+        You can find more information on Yocto Project by visiting the website at
+        <ulink url='http://www.yoctoproject.org'></ulink>.
+        </para>
     </para>
 </section>
 

documentation/kernel-manual/kernel-manual.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <book id='kernel-manual' lang='en' 
       xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -32,37 +31,23 @@
             <revision>
                 <revnumber>0.9</revnumber>
                 <date>24 November 2010</date>
-                <revremark>The initial document draft released with the Yocto Project 0.9 Release.</revremark>
+                <revremark>This revision is the initial document draft and corresponds with 
+                    the Yocto Project 0.9 Release.</revremark>
             </revision>
             <revision>
                 <revnumber>1.0</revnumber>
                 <date>6 April 2011</date>
-                <revremark>Released with the Yocto Project 1.0 Release.</revremark>
+                <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 the Yocto Project 1.0.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1</revnumber>
-                <date>6 October 2011</date>
-                <revremark>Released with the Yocto Project 1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.1</revnumber>
-                <date>15 March 2012</date>
-                <revremark>Released with the Yocto Project 1.1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.2</revnumber>
-                <date>July 2012</date>
-                <revremark>Released with the Yocto Project 1.1.2 Release.</revremark>
+                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
             </revision>
         </revhistory>
 
     <copyright>
-      <year>&COPYRIGHT_YEAR;</year>
+      <year>2010-2011</year>
       <holder>Linux Foundation</holder>
     </copyright>
 
@@ -74,9 +59,9 @@
       <note>
           Due to production processes, there could be differences between the Yocto Project
           documentation bundled in the release tarball and 
-          <ulink url='&YOCTO_DOCS_KERNEL_URL;'>
+          <ulink url='http://www.yoctoproject.org/docs/1.1/kernel-manual/kernel-manual.html'>
           The Yocto Project Kernel Architecture and Use Manual</ulink> on
-          the <ulink url='&YOCTO_HOME_URL;'>Yocto Project</ulink> website.
+          the <ulink url='http://www.yoctoproject.org'>Yocto Project</ulink> website.
           For the latest version of this manual, see the manual on the website.
       </note>
     </legalnotice>

documentation/kernel-manual/style.css

@@ -654,7 +654,7 @@ hr {
 
 
 .tip, .warning, .caution, .note {
-  border-color: #fff;
+  border-color: #aaa;
 }
 
 
@@ -662,24 +662,24 @@ hr {
 .warning table th,
 .caution table th,
 .note table th {
-  border-bottom-color: #fff;
+  border-bottom-color: #aaa;
 }
 
 
 .warning {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .caution {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .tip {
-  background-color: #f0f0f2;
+  background-color: #eff;
 }
 
 .note {
-  background-color: #f0f0f2; 
+  background-color: #dfc;
 }
 
 .glossary dl dt, 
@@ -946,8 +946,8 @@ table {
 
 .tip,
 .note {
-   background: #f0f0f2; 
-   color: #333;   
+   background: #666666;
+   color: #fff;   
    padding: 20px;
    margin: 20px;
 }
@@ -958,26 +958,11 @@ table {
    margin: 0em;
    font-size: 2em;
    font-weight: bold;
-   color: #333;   
+   color: #fff;   
 }
 
 .tip a,
 .note a {
-   color: #333;   
+   color: #fff;   
    text-decoration: underline;
 }
-
-.footnote {
-   font-size: small;
-   color: #333;
-}
-
-/* Changes the announcement text */
-.tip h3,
-.warning h3,
-.caution h3,
-.note h3 {
-   font-size:large;
-   color: #00557D;
-}
-

documentation/poky-ref-manual/development.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id="platdev">
 <title>Platform Development with the Yocto Project</title>
@@ -83,7 +82,7 @@
             The current release of the Yocto Project no longer supports the Anjuta plug-in.
             However, the Poky Anjuta Plug-in is available to download directly from the Poky 
             Git repository located through the web interface at
-            <ulink url="&YOCTO_GIT_URL;"></ulink> under IDE Plugins.
+            <ulink url="http://git.yoctoproject.org/"></ulink> under IDE Plugins.
             The community is free to continue supporting it beyond the Yocto Project 0.9
             Release.            
         </note>
@@ -92,8 +91,10 @@
             with other plug-ins installed into the Eclipse IDE.
             Once you have your environment setup you need to configure the Eclipse plug-in.
             For information on how to install and configure the Eclipse plug-in, see the
-            "<ulink url='&YOCTO_DOCS_ADT_URL;#adt-eclipse'>Working Within Eclipse</ulink>" chapter in the 
-            Yocto Project Application Development Toolkit (ADT) User's Guide.
+            <ulink url='http://www.yoctoproject.org/docs/adt-manual/adt-manual.html#adt-eclipse'>
+            "Working Within Eclipse"</ulink> chapter in the 
+            <ulink url='http://www.yoctoproject.org/docs/adt-manual/adt-manual.html'>
+            "Application Development Toolkit (ADT) User's Guide."</ulink>
          </para>
          </section>
 
@@ -101,8 +102,8 @@
         <title>External Development Using the QEMU Emulator</title>
         <para>
             Running Poky QEMU images is covered in the 
-            "<ulink url='&YOCTO_DOCS_ADT_URL;#test-run'>A Quick Test Run</ulink>" section of
-            the Yocto Project Quick Start.
+            <ulink url="http://www.yoctoproject.org/docs/yocto-quick-start/yocto-project-qs.html">
+            Yocto Project Quick Start</ulink> in the "A Quick Test Run" section.
         </para>
         <para>
             The QEMU images shipped with the Yocto Project contain complete toolchains
@@ -161,8 +162,8 @@
         <para>
             Working directly with the Yocto Project is a fast and effective development technique.
             The idea is that you can directly edit files in a working directory
-            (<filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>) 
-            or the source directory (<filename><link linkend='var-S'>S</link></filename>) 
+            (<glossterm><link linkend='var-WORKDIR'>WORKDIR</link></glossterm>) 
+            or the source directory (<glossterm><link linkend='var-S'>S</link></glossterm>) 
             and then force specific tasks to rerun in order to test the changes. 
             An example session working on the matchbox-desktop package might 
             look like this:
@@ -202,16 +203,16 @@
         <para>
             It is useful when making changes directly to the work directory files to do
             so using the Quilt tool as detailed in the 
-            "<link linkend='usingpoky-modifying-packages-quilt'>Modifying Package Source Code with Quilt</link>"
-             section. 
+            <link linkend='usingpoky-modifying-packages-quilt'> 
+            Modifying Package Source Code with Quilt</link> section. 
             Using Quilt, you can copy patches into the recipe directory and use the patches directly 
-            through use of the <filename><link linkend='var-SRC_URI'>SRC_URI</link></filename> variable.
+            through use of the <glossterm><link linkend='var-SRC_URI'>SRC_URI</link></glossterm> variable.
         </para>
 
         <para>
             For a review of the skills used in this section, see the 
-            "<link linkend="usingpoky-components-bitbake">BitBake</link>" and 
-            "<link linkend="usingpoky-debugging-taskrunning">Running Specific Tasks</link>" sections
+            <link linkend="usingpoky-components-bitbake">BitBake</link> and 
+            <link linkend="usingpoky-debugging-taskrunning">Running Specific Tasks</link> sections
             in this manual.
         </para>
         </section>
@@ -230,7 +231,7 @@
             still defined so you can use commands such as <filename>configure</filename> and 
             <filename>make</filename>. 
             The commands execute just as if the Yocto Project build system were executing them. 
-            Consequently, working this way can be helpful when debugging a build or preparing 
+            Consequently, workng this way can be helpful when debugging a build or preparing 
             software to be used with the Yocto Project build system.
         </para>
 
@@ -261,7 +262,7 @@
             or <filename>compile</filename> commands as if they were being run by 
             the Yocto Project build system itself.
             As noted earlier, the working directory also automatically changes to the 
-            source directory (<filename><link linkend='var-S'>S</link></filename>).
+            source directory (<glossterm><link linkend='var-S'>S</link></glossterm>).
         </para>
 
         <para> 
@@ -271,8 +272,8 @@
         <para>
             The default shell used by <filename>devshell</filename> is xterm. 
             You can use other terminal forms by setting the 
-            <filename><link linkend='var-TERMCMD'>TERMCMD</link></filename> and 
-            <filename><link linkend='var-TERMCMDRUN'>TERMCMDRUN</link></filename> variables 
+            <glossterm><link linkend='var-TERMCMD'>TERMCMD</link></glossterm> and 
+            <glossterm><link linkend='var-TERMCMDRUN'>TERMCMDRUN</link></glossterm> variables 
             in the Yocto Project's <filename>local.conf</filename> file found in the build
             directory. 
             For examples of the other options available, see the "UI/Interaction Configuration"
@@ -283,7 +284,7 @@
 
         <para>
             Because an external shell is launched rather than opening directly into the 
-            original terminal window, it allows easier interaction with BitBake's multiple
+            original terminal window, it allows easier interaction with Bitbake's multiple 
             threads as well as accomodates a future client/server split.
         </para>
 
@@ -293,7 +294,7 @@
             instead of just using <filename>gcc</filename>.
             The same applies to other applications such as <filename>binutils</filename>, 
             <filename>libtool</filename> and so forth.
-            BitBake sets up environment variables such as <filename>CC</filename>
+            The Yocto Project has setup environment variables such as <filename>CC</filename>
             to assist applications, such as <filename>make</filename> to find the correct tools.</para>
             <para>It is also worth noting that <filename>devshell</filename> still works over
             X11 forwarding and similar situations</para>
@@ -332,7 +333,7 @@
         It also allows you to perform post-mortem style analysis of program crashes. 
         GDB is available as a package within the Yocto Project and by default is 
         installed in sdk images.
-        See the "<link linkend='ref-images'>Reference: Images</link>" appendix for a description of these
+        See <xref linkend='ref-images'>Reference: Images</xref> for a description of these
         images. 
         You can find information on GDB at <ulink url="http://sourceware.org/gdb/"/>.
     </para>
@@ -670,7 +671,7 @@
         <para>
             A graphical user interface for OProfile is also available. 
             You can download and build this interface from the Yocto Project at
-            <ulink url="&YOCTO_GIT_URL;/cgit.cgi/oprofileui/"></ulink>. 
+            <ulink url="http://git.yoctoproject.org/cgit.cgi/oprofileui/"></ulink>. 
             If the "tools-profile" image feature is selected, all necessary binaries
             are installed onto the target device for OProfileUI interaction.
         </para>
@@ -678,7 +679,7 @@
         <para>
             Even though the Yocto Project usually includes all needed patches on the target device, you 
             might find you need other OProfile patches for recent OProfileUI features.
-            If so, see the <ulink url='&YOCTO_GIT_URL;/cgit.cgi/oprofileui/tree/README'>
+            If so, see the <ulink url='http://git.yoctoproject.org/cgit.cgi/oprofileui/tree/README'>
             OProfileUI README</ulink> for the most recent information.
         </para>
 
@@ -764,8 +765,8 @@
                 is not always necessary to actually have them on the device for OProfile use. 
                 All that is needed is a copy of the filesystem with the debug symbols present 
                 on the viewer system. 
-                The "<link linkend='platdev-gdb-remotedebug-launch-gdb'>Launching GDB on the Host Computer</link>"
-                section covers how to create such a directory with 
+                The <link linkend='platdev-gdb-remotedebug-launch-gdb'>Launching GDB
+                on the Host Computer</link> section covers how to create such a directory with 
                 the Yocto Project and how to use the OProfileUI Settings dialog to specify the location.
                 If you specify the directory, it will be used when the file checksums 
                 match those on the system you are profiling.

documentation/poky-ref-manual/extendpoky.xml

@@ -1,17 +1,15 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='extendpoky'>
 
-<title>Common Tasks</title>
+<title>Extending the Yocto Project</title>
     <para>
-        This chapter describes standard tasks such as adding new
+        This chapter provides information about how to extend the functionality
+        already present in the Yocto Project.
+        The chapter also documents standard tasks such as adding new
         software packages, extending or customizing images or porting the Yocto Project to
         new hardware (adding a new machine). 
-        The chapter also describes ways to modify package source code, combine multiple 
-        versions of library files into a single image, track license changes, and handle
-        a package name alias.
         Finally, the chapter contains advice about how to make changes to the 
         Yocto Project to achieve the best results.
     </para>
@@ -25,7 +23,7 @@
             variables.
             For information on variables that are useful for recipes and for information about recipe naming
             issues, see the 
-            "<link linkend='ref-varlocality-recipe-required'>Required</link>" section for recipe variables.
+            <link linkend='ref-varlocality-recipe-required'>Required</link> section for recipe variables.
         </para>
 
         <para>
@@ -81,8 +79,7 @@
                 By default, the <filename>helloworld</filename>, <filename>helloworld-dbg</filename>,
                 and <filename>helloworld-dev</filename> packages are built. 
                 For information on how to customize the packaging process, see the
-                "<link linkend='splitting-an-application-into-multiple-packages'>Splitting an Application
-                into Multiple Packages</link>" section.
+                <link linkend='usingpoky-extend-addpkg-files'>Controlling Package Content</link> section.
             </para>
         </section>
 
@@ -115,7 +112,7 @@
             <para>
                 The variable <filename><link linkend='var-LIC_FILES_CHKSUM'>LIC_FILES_CHKSUM</link>
                 </filename> is used to track source license changes as described in the
-                "<link linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>Track License Change</link>"
+                <link linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>Track License Change</link>
                 section. 
                 You can quickly create Autotool-based recipes in a manner similar to the previous example.
             </para>
@@ -177,8 +174,8 @@
             </para>
         </section>
 
-        <section id='splitting-an-application-into-multiple-packages'>
-            <title>Splitting an Application into Multiple Packages</title>
+        <section id='usingpoky-extend-addpkg-files'>
+            <title>Controlling Package Content</title>
 
             <para>                        
                 You can use the variables <filename><link linkend='var-PACKAGES'>PACKAGES</link></filename> and 
@@ -225,59 +222,6 @@
             </para>
         </section>
 
-        <section id='including-static-library-files'>
-            <title>Including Static Library Files</title>
-
-            <para>                        
-                If you are building a library and the library offers static linking, you can control
-                which static library files (<filename>*.a</filename> files) get included in the 
-                built library.  
-            </para>
-
-            <para>
-                The <filename>PACKAGES</filename> and <filename>FILES_*</filename> variables in the 
-                <filename>meta/conf/bitbake.conf</filename> configuration file define how files installed
-                by the <filename>do_install</filename> task are packaged.
-                By default, the <filename>PACKAGES</filename> variable contains 
-                <filename>${PN}-staticdev</filename>, which includes all static library files.
-                <note>
-                    Previously released versions of the Yocto Project defined the static library files 
-                    through <filename>${PN}-dev</filename>.
-                </note>
-                Following, is part of the BitBake configuration file. 
-                You can see where the static library files are defined:
-                <literallayout class='monospaced'>
-     PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-staticdev ${PN}-locale"
-     PACKAGES_DYNAMIC = "${PN}-locale-*"
-     FILES = ""
-
-     FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \
-                 ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-                 ${base_bindir}/* ${base_sbindir}/* \
-                 ${base_libdir}/*${SOLIBS} \
-                 ${datadir}/${BPN} ${libdir}/${BPN}/* \
-                 ${datadir}/pixmaps ${datadir}/applications \
-                 ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
-                 ${libdir}/bonobo/servers"
-
-     FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \
-                 ${datadir}/gnome/help"
-     SECTION_${PN}-doc = "doc"
-     
-     FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
-                     ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig \
-                     ${datadir}/aclocal ${base_libdir}/*.o"
-     SECTION_${PN}-dev = "devel"
-     ALLOW_EMPTY_${PN}-dev = "1"
-     RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
-     
-     FILES_${PN}-staticdev = "${libdir}/*.a ${base_libdir}/*.a"
-     SECTION_${PN}-staticdev = "devel"
-     RDEPENDS_${PN}-staticdev = "${PN}-dev (= ${EXTENDPKGV})"
-                </literallayout>
-            </para>
-        </section>
-
         <section id='usingpoky-extend-addpkg-postinstalls'>
             <title>Post Install Scripts</title>
 
@@ -359,7 +303,7 @@
                 It is important to use the correct names of packages in the 
                 <filename><link linkend='var-IMAGE_INSTALL'>IMAGE_INSTALL</link></filename> variable. 
                 You must use the OpenEmbedded notation and not the Debian notation for the names 
-                (e.g. <filename>eglibc-dev</filename> instead of <filename>libc6-dev</filename>).
+                (e.g. <filename>glibc-dev</filename> instead of <filename>libc6-dev</filename>).
             </para>
 
             <para>
@@ -526,16 +470,17 @@
             The information covers adding machines similar to those the Yocto Project already supports. 
             Although well within the capabilities of the Yocto Project, adding a totally new architecture 
             might require 
-            changes to <filename>gcc/eglibc</filename> and to the site information, which is 
+            changes to <filename>gcc/glibc</filename> and to the site information, which is 
             beyond the scope of this manual.
         </para>
 
         <para>
             For a complete example that shows how to add a new machine to the Yocto Project, 
             see the 
-            <ulink url='&YOCTO_DOCS_DEV_URL;#dev-manual-bsp-appendix'>
+            <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#dev-manual-bsp-appendix'>
             BSP Development Example</ulink> in Appendix A of  
-            The Yocto Project Development Manual.
+            <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
+            The Yocto Project Development Manual</ulink>.
         </para>
 
         <section id="platdev-newmachine-conffile">
@@ -659,412 +604,6 @@
         </section>
     </section>
 
-    <section id="usingpoky-modifing-packages">
-        <title>Modifying Package Source Code</title>
-        <para>
-            Although the Yocto Project is usually used to build software, you can use it to modify software. 
-        </para>
-
-        <para>
-            During a build, source is available in the 
-            <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename> directory.
-            The actual location depends on the type of package and the architecture of the target device. 
-            For a standard recipe not related to 
-            <filename><link linkend='var-MACHINE'>MACHINE</link></filename>, the location is
-            <filename>tmp/work/PACKAGE_ARCH-poky-TARGET_OS/PN-PV-PR/</filename>.
-            For target device-dependent packages, you should use the <filename>MACHINE</filename>
-            variable instead of 
-            <filename><link linkend='var-PACKAGE_ARCH'>PACKAGE_ARCH</link></filename> 
-            in the directory name.
-        </para>
-
-        <tip>
-            Be sure the package recipe sets the 
-            <filename><link linkend='var-S'>S</link></filename> variable to something
-            other than the standard <filename>WORKDIR/PN-PV/</filename> value.
-        </tip>
-
-        <para>
-            After building a package, you can modify the package source code without problems. 
-            The easiest way to test your changes is by calling the 
-            <filename>compile</filename> task as shown in the following example:
-            <literallayout class='monospaced'>
-     $ bitbake -c compile -f NAME_OF_PACKAGE
-            </literallayout>
-        </para>
-
-        <para>
-            The <filename>-f</filename> or <filename>--force</filename>
-            option forces re-execution of the specified task.
-            You can call other tasks this way as well. 
-            But note that all the modifications in 
-            <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>
-            are gone once you execute <filename>-c clean</filename> for a package.
-        </para>
-    </section>
-
-    <section id="usingpoky-modifying-packages-quilt">
-        <title>Modifying Package Source Code with Quilt</title>
-            
-        <para>
-            By default Poky uses <ulink url='http://savannah.nongnu.org/projects/quilt'>Quilt</ulink>
-            to manage patches in the <filename>do_patch</filename> task. 
-            This is a powerful tool that you can use to track all modifications to package sources.
-        </para>
-
-        <para>
-            Before modifying source code, it is important to notify Quilt so it can track the changes 
-            into the new patch file:
-            <literallayout class='monospaced'>
-     $ quilt new NAME-OF-PATCH.patch
-            </literallayout>
-        </para>
-
-        <para>
-            After notifying Quilt, add all modified files into that patch:
-            <literallayout class='monospaced'>
-     $ quilt add file1 file2 file3
-            </literallayout>
-        </para>
-
-        <para>
-            You can now start editing. 
-            Once you are done editing, you need to use Quilt to generate the final patch that 
-            will contain all your modifications.
-            <literallayout class='monospaced'>
-     $ quilt refresh
-            </literallayout>
-        </para>
-
-        <para>
-            You can find the resulting patch file in the
-            <filename>patches/</filename> subdirectory of the source 
-            (<filename><link linkend='var-S'>S</link></filename>) directory. 
-            For future builds, you should copy the patch into the Yocto Project metadata and add it into the 
-            <filename><link linkend='var-SRC_URI'>SRC_URI</link></filename> of a recipe.  
-            Here is an example:
-            <literallayout class='monospaced'>
-     SRC_URI += "file://NAME-OF-PATCH.patch"
-            </literallayout>
-        </para>
-
-        <para>
-            Finally, don't forget to 'bump' the 
-            <filename><link linkend='var-PR'>PR</link></filename> value in the same recipe since 
-            the resulting packages have changed.
-        </para>
-    </section>
-
-    <section id="building-multiple-architecture-libraries-into-one-image">
-        <title>Combining Multiple Versions of Library Files into One Image</title>
-
-        <para>
-            The build system offers the ability to build libraries with different
-            target optimizations or architecture formats and combine these together
-            into one system image. 
-            You can link different binaries in the image 
-            against the different libraries as needed for specific use cases.
-            This feature is called "Multilib."
-        </para>
-
-        <para>
-            An example would be where you have most of a system compiled in 32-bit
-            mode using 32-bit libraries, but you have something large, like a database
-            engine, that needs to be a 64-bit application and use 64-bit libraries.
-            Multilib allows you to get the best of both 32-bit and 64-bit libraries.
-        </para>
-
-        <para>
-            While the Multilib feature is most commonly used for 32 and 64-bit differences,
-            the approach the build system uses facilitates different target optimizations. 
-            You could compile some binaries to use one set of libraries and other binaries
-            to use other different sets of libraries.
-            The libraries could differ in architecture, compiler options, or other 
-            optimizations.
-        </para>
-
-        <para>
-            This section overviews the Multilib process only. 
-            For more details on how to implement Multilib, see the 
-            <ulink url='&YOCTO_WIKI_URL;/wiki/Multilib'>Multilib</ulink> wiki 
-            page.
-        </para>
-
-        <section id='preparing-to-use-multilib'>
-            <title>Preparing to use Multilib</title>
-
-            <para>
-                User-specific requirements drive the Multilib feature,
-                Consequently, there is no one "out-of-the-box" configuration that likely
-                exists to meet your needs.
-            </para>
-
-            <para>
-                In order to enable Multilib, you first need to ensure your recipe is
-                extended to support multiple libraries. 
-                Many standard recipes are already extended and support multiple libraries.
-                You can check in the <filename>meta/conf/multilib.conf</filename>
-                configuration file in the Yocto Project files directory to see how this is 
-                done using the <filename>BBCLASSEXTEND</filename> variable.
-                Eventually, all recipes will be covered and this list will be unneeded.
-            </para>
-  
-            <para>
-                For the most part, the Multilib class extension works automatically to
-                extend the package name from <filename>${PN}</filename> to
-                <filename>${MLPREFIX}${PN}</filename>, where <filename>MLPREFIX</filename>
-                is the particular multilib (e.g. "lib32-" or "lib64-"). 
-                Standard variables such as <filename>DEPENDS</filename>, 
-                <filename>RDEPENDS</filename>, <filename>RPROVIDES</filename>, 
-                <filename>RRECOMMENDS</filename>, <filename>PACKAGES</filename>, and 
-                <filename>PACKAGES_DYNAMIC</filename> are automatically extended by the system.
-                If you are extending any manual code in the recipe, you can use the 
-                <filename>${MLPREFIX}</filename> variable to ensure those names are extended 
-                correctly. 
-                This automatic extension code resides in <filename>multilib.bbclass</filename>.
-            </para>
-        </section>
-
-        <section id='using-multilib'>
-            <title>Using Multilib</title>
-
-            <para>
-                After you have set up the recipes, you need to define the actual
-                combination of multiple libraries you want to build. 
-                You accomplish this through your <filename>local.conf</filename>
-                configuration file in the Yocto Project build directory. 
-                An example configuration would be as follows:
-                <literallayout class='monospaced'>
-     MACHINE = "qemux86-64"
-     require conf/multilib.conf
-     MULTILIBS = "multilib:lib32"
-     DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
-     MULTILIB_IMAGE_INSTALL = "lib32-connman"
-                </literallayout>
-                This example enables an
-                additional library named <filename>lib32</filename> alongside the 
-                normal target packages.
-                When combining these "lib32" alternatives, the example uses "x86" for tuning.
-                For information on this particular tuning, see
-                <filename>meta/conf/machine/include/ia32/arch-ia32.inc</filename>.
-            </para>
-
-            <para>
-                The example then includes <filename>lib32-connman</filename>
-                in all the images, which illustrates one method of including a 
-                multiple library dependency. 
-                You can use a normal image build to include this dependency,
-                for example:
-                <literallayout class='monospaced'>
-     $ bitbake core-image-sato
-                </literallayout>
-                You can also build Multilib packages specifically with a command like this:
-                <literallayout class='monospaced'>
-     $  bitbake lib32-connman
-                </literallayout>
-            </para>
-        </section>
-
-        <section id='additional-implementation-details'>
-            <title>Additional Implementation Details</title>
-
-            <para>
-                Different packaging systems have different levels of native Multilib
-                support. 
-                For the RPM Package Management System, the following implementation details 
-                exist:
-                <itemizedlist>
-                    <listitem><para>A unique architecture is defined for the Multilib packages,
-                        along with creating a unique deploy folder under 
-                        <filename>tmp/deploy/rpm</filename> in the Yocto
-                        Project build directory. 
-                        For example, consider <filename>lib32</filename> in a 
-                        <filename>qemux86-64</filename> image. 
-                        The possible architectures in the system are "all", "qemux86_64",
-                        "lib32_qemux86_64", and "lib32_x86".</para></listitem>
-                    <listitem><para>The <filename>${MLPREFIX}</filename> variable is stripped from 
-                        <filename>${PN}</filename> during RPM packaging.
-                        The naming for a normal RPM package and a Multilib RPM package in a
-                        <filename>qemux86-64</filename> system resolves to something similar to
-                        <filename>bash-4.1-r2.x86_64.rpm</filename> and 
-                        <filename>bash-4.1.r2.lib32_x86.rpm</filename>, respectively.
-                        </para></listitem>
-                    <listitem><para>When installing a Multilib image, the RPM backend first 
-                        installs the base image and then installs the Multilib libraries.
-                        </para></listitem>
-                    <listitem><para>The build system relies on RPM to resolve the identical files in the 
-                        two (or more) Multilib packages.</para></listitem>
-                </itemizedlist>
-            </para>
-
-            <para>
-                For the IPK Package Management System, the following implementation details exist:
-                <itemizedlist>
-                    <listitem><para>The <filename>${MLPREFIX}</filename> is not stripped from 
-                        <filename>${PN}</filename> during IPK packaging.
-                        The naming for a normal RPM package and a Multilib IPK package in a
-                        <filename>qemux86-64</filename> system resolves to something like 
-                        <filename>bash_4.1-r2.x86_64.ipk</filename> and
-                        <filename>lib32-bash_4.1-rw_x86.ipk</filename>, respectively.
-                        </para></listitem>
-                    <listitem><para>The IPK deploy folder is not modified with 
-                        <filename>${MLPREFIX}</filename> because packages with and without 
-                        the Multilib feature can exist in the same folder due to the 
-                        <filename>${PN}</filename> differences.</para></listitem>
-                    <listitem><para>IPK defines a sanity check for Multilib installation 
-                        using certain rules for file comparison, overridden, etc.
-                        </para></listitem>
-                </itemizedlist>
-            </para>
-        </section> 
-    </section>
-
-    <section id="usingpoky-configuring-LIC_FILES_CHKSUM">
-        <title>Tracking License Changes</title>
-
-        <para>
-            The license of an upstream project might change in the future. In order to prevent these changes
-            going unnoticed, the Yocto Project provides a 
-            <filename><link linkend='var-LIC_FILES_CHKSUM'>LIC_FILES_CHKSUM</link></filename>
-            variable to track changes to the license text. The checksums are validated at the end of the
-            configure step, and if the checksums do not match, the build will fail.
-        </para>
-
-        <section id="usingpoky-specifying-LIC_FILES_CHKSUM">
-            <title>Specifying the <filename>LIC_FILES_CHKSUM</filename> Variable</title>
-
-            <para>
-                The <filename>LIC_FILES_CHKSUM</filename>
-                variable contains checksums of the license text in the source code for the recipe.
-                Following is an example of how to specify <filename>LIC_FILES_CHKSUM</filename>:
-                <literallayout class='monospaced'>
-     LIC_FILES_CHKSUM = "file://COPYING;md5=xxxx \
-                         file://licfile1.txt;beginline=5;endline=29;md5=yyyy \
-                         file://licfile2.txt;endline=50;md5=zzzz \
-                         ..."
-                </literallayout>
-            </para>
-
-            <para>
-                The Yocto Project uses the 
-                <filename><link linkend='var-S'>S</link></filename> variable as the 
-                default directory used when searching files listed in 
-                <filename>LIC_FILES_CHKSUM</filename>.
-                The previous example employs the default directory.
-            </para>
-
-            <para>
-                You can also use relative paths as shown in the following example: 
-                <literallayout class='monospaced'>
-     LIC_FILES_CHKSUM = "file://src/ls.c;startline=5;endline=16;\
-                                         md5=bb14ed3c4cda583abc85401304b5cd4e"
-     LIC_FILES_CHKSUM = "file://../license.html;md5=5c94767cedb5d6987c902ac850ded2c6"
-                </literallayout>
-            </para>
-
-            <para>
-                In this example, the first line locates a file in 
-                <filename><link linkend='var-S'>S</link>/src/ls.c</filename>. 
-                The second line refers to a file in 
-                <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>, which is the parent
-                of <filename>S</filename>.
-            </para>
-            <para>
-                Note that this variable is mandatory for all recipes, unless the 
-                <filename>LICENSE</filename> variable is set to "CLOSED".
-            </para>
-        </section>
-
-        <section id="usingpoky-LIC_FILES_CHKSUM-explanation-of-syntax">
-            <title>Explanation of Syntax</title>
-            <para>
-                As mentioned in the previous section, the 
-                <filename>LIC_FILES_CHKSUM</filename> variable lists all the 
-                important files that contain the license text for the source code. 
-                It is possible to specify a checksum for an entire file, or a specific section of a
-                file (specified by beginning and ending line numbers with the "beginline" and "endline"
-                parameters, respectively). 
-                The latter is useful for source files with a license notice header,
-                README documents, and so forth.
-                If you do not use the "beginline" parameter, then it is assumed that the text begins on the 
-                first line of the file. 
-                Similarly, if you do not use the "endline" parameter, it is assumed that the license text 
-                ends with the last line of the file. 
-            </para>
-
-            <para>
-                The "md5" parameter stores the md5 checksum of the license text. 
-                If the license text changes in any way as compared to this parameter
-                then a mismatch occurs.
-                This mismatch triggers a build failure and notifies the developer.
-                Notification allows the developer to review and address the license text changes.
-                Also note that if a mismatch occurs during the build, the correct md5 
-                checksum is placed in the build log and can be easily copied to the recipe.
-            </para>
-
-            <para>
-                There is no limit to how many files you can specify using the 
-                <filename>LIC_FILES_CHKSUM</filename> variable.
-                Generally, however, every project requires a few specifications for license tracking. 
-                Many projects have a "COPYING" file that stores the license information for all the source 
-                code files.
-                This practice allows you to just track the "COPYING" file as long as it is kept up to date. 
-            </para>
-
-            <tip>
-                If you specify an empty or invalid "md5" parameter, BitBake returns an md5 mis-match 
-                error and displays the correct "md5" parameter value during the build. 
-                The correct parameter is also captured in the build log. 
-            </tip>
-
-            <tip>
-                If the whole file contains only license text, you do not need to use the "beginline" and 
-                "endline" parameters. 
-            </tip>
-        </section>
-    </section>
-
-    <section id="usingpoky-configuring-DISTRO_PN_ALIAS">
-        <title>Handling a Package Name Alias</title>
-        <para>
-            Sometimes a package name you are using might exist under an alias or as a similarly named
-            package in a different distribution.
-            The Yocto Project implements a <filename>distro_check</filename>
-            task that automatically connects to major distributions
-            and checks for these situations. 
-            If the package exists under a different name in a different distribution, you get a 
-            <filename>distro_check</filename> mismatch.  
-            You can resolve this problem by defining a per-distro recipe name alias using the 
-            <filename><link linkend='var-DISTRO_PN_ALIAS'>DISTRO_PN_ALIAS</link></filename> variable.
-        </para>
-
-        <para>
-            Following is an example that shows how you specify the <filename>DISTRO_PN_ALIAS</filename>
-            variable:
-            <literallayout class='monospaced'>
-     DISTRO_PN_ALIAS_pn-PACKAGENAME = "distro1=package_name_alias1 \
-                                       distro2=package_name_alias2 \
-                                       distro3=package_name_alias3 \
-                                       ..."
-            </literallayout>
-        </para>
-        
-        <para>
-            If you have more than one distribution alias, separate them with a space.
-            Note that the Yocto Project currently automatically checks the 
-            Fedora, OpenSuSE, Debian, Ubuntu, 
-            and Mandriva distributions for source package recipes without having to specify them 
-            using the <filename>DISTRO_PN_ALIAS</filename> variable.
-            For example, the following command generates a report that lists the Linux distributions
-            that include the sources for each of the Yocto Project recipes.
-            <literallayout class='monospaced'>
-     $ bitbake world -f -c distro_check
-            </literallayout>
-            The results are stored in the <filename>build/tmp/log/distro_check-${DATETIME}.results</filename> 
-            file found in the Yocto Project files area.
-        </para>
-    </section>
-
     <section id="usingpoky-changes">
         <title>Making and Maintaining Changes</title>
         <para>
@@ -1076,7 +615,7 @@
         </para>
 
         <para>
-            The Yocto Project supports a "<link linkend='usingpoky-changes-layers'>layers</link>" concept.
+            The Yocto Project supports a <link linkend='usingpoky-changes-layers'>"layers"</link> concept.
             If you use layers properly, you can ease future upgrades and allow segregation
             between the Yocto Project core and a given developer's changes. 
             The following section provides more advice on managing changes to the Yocto Project.
@@ -1321,7 +860,7 @@
                 Experience shows that buildbot is a good fit for this role. 
                 What works well is to configure buildbot to make two types of builds:
                 incremental and full (from scratch).  
-                See <ulink url='&YOCTO_AB_URL;:8010'>the buildbot for the 
+                See <ulink url='http://autobuilder.yoctoproject.org:8010'>the buildbot for the 
                 Yocto Project</ulink> for an example implementation that uses buildbot.
             </para>
 
@@ -1383,6 +922,247 @@
         </section>
     </section>
 
+    <section id="usingpoky-modifing-packages">
+        <title>Modifying Package Source Code</title>
+        <para>
+            Although the Yocto Project is usually used to build software, you can use it to modify software. 
+        </para>
+
+        <para>
+            During a build, source is available in the 
+            <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename> directory.
+            The actual location depends on the type of package and the architecture of the target device. 
+            For a standard recipe not related to 
+            <filename><link linkend='var-MACHINE'>MACHINE</link></filename>, the location is
+            <filename>tmp/work/PACKAGE_ARCH-poky-TARGET_OS/PN-PV-PR/</filename>.
+            For target device-dependent packages, you should use the <filename>MACHINE</filename>
+            variable instead of 
+            <filename><link linkend='var-PACKAGE_ARCH'>PACKAGE_ARCH</link></filename> 
+            in the directory name.
+        </para>
+
+        <tip>
+            Be sure the package recipe sets the 
+            <filename><link linkend='var-S'>S</link></filename> variable to something
+            other than the standard <filename>WORKDIR/PN-PV/</filename> value.
+        </tip>
+
+        <para>
+            After building a package, you can modify the package source code without problems. 
+            The easiest way to test your changes is by calling the 
+            <filename>compile</filename> task as shown in the following example:
+            <literallayout class='monospaced'>
+     $ bitbake -c compile -f NAME_OF_PACKAGE
+            </literallayout>
+        </para>
+
+        <para>
+            The <filename>-f</filename> or <filename>--force</filename>
+            option forces re-execution of the specified task.
+            You can call other tasks this way as well. 
+            But note that all the modifications in 
+            <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>
+            are gone once you execute <filename>-c clean</filename> for a package.
+        </para>
+    </section>
+
+    <section id="usingpoky-modifying-packages-quilt">
+        <title>Modifying Package Source Code with Quilt</title>
+            
+        <para>
+            By default Poky uses <ulink url='http://savannah.nongnu.org/projects/quilt'>Quilt</ulink>
+            to manage patches in the <filename>do_patch</filename> task. 
+            This is a powerful tool that you can use to track all modifications to package sources.
+        </para>
+
+        <para>
+            Before modifying source code, it is important to notify Quilt so it can track the changes 
+            into the new patch file:
+            <literallayout class='monospaced'>
+     $ quilt new NAME-OF-PATCH.patch
+            </literallayout>
+        </para>
+
+        <para>
+            After notifying Quilt, add all modified files into that patch:
+            <literallayout class='monospaced'>
+     $ quilt add file1 file2 file3
+            </literallayout>
+        </para>
+
+        <para>
+            You can now start editing. 
+            Once you are done editing, you need to use Quilt to generate the final patch that 
+            will contain all your modifications.
+            <literallayout class='monospaced'>
+     $ quilt refresh
+            </literallayout>
+        </para>
+
+        <para>
+            You can find the resulting patch file in the
+            <filename>patches/</filename> subdirectory of the source 
+            (<filename><link linkend='var-S'>S</link></filename>) directory. 
+            For future builds, you should copy the patch into the Yocto Project metadata and add it into the 
+            <filename><link linkend='var-SRC_URI'>SRC_URI</link></filename> of a recipe.  
+            Here is an example:
+            <literallayout class='monospaced'>
+     SRC_URI += "file://NAME-OF-PATCH.patch"
+            </literallayout>
+        </para>
+
+        <para>
+            Finally, don't forget to 'bump' the 
+            <filename><link linkend='var-PR'>PR</link></filename> value in the same recipe since 
+            the resulting packages have changed.
+        </para>
+    </section>
+
+    <section id="usingpoky-configuring-LIC_FILES_CHKSUM">
+        <title>Tracking License Changes</title>
+
+        <para>
+            The license of an upstream project might change in the future. In order to prevent these changes
+            going unnoticed, the Yocto Project provides a 
+            <filename><link linkend='var-LIC_FILES_CHKSUM'>LIC_FILES_CHKSUM</link></filename>
+            variable to track changes to the license text. The checksums are validated at the end of the
+            configure step, and if the checksums do not match, the build will fail.
+        </para>
+
+        <section id="usingpoky-specifying-LIC_FILES_CHKSUM">
+            <title>Specifying the <filename>LIC_FILES_CHKSUM</filename> Variable</title>
+
+            <para>
+                The <filename>LIC_FILES_CHKSUM</filename>
+                variable contains checksums of the license text in the source code for the recipe.
+                Following is an example of how to specify <filename>LIC_FILES_CHKSUM</filename>:
+                <literallayout class='monospaced'>
+     LIC_FILES_CHKSUM = "file://COPYING;md5=xxxx \
+                         file://licfile1.txt;beginline=5;endline=29;md5=yyyy \
+                         file://licfile2.txt;endline=50;md5=zzzz \
+                         ..."
+                </literallayout>
+            </para>
+
+            <para>
+                The Yocto Project uses the 
+                <filename><link linkend='var-S'>S</link></filename> variable as the 
+                default directory used when searching files listed in 
+                <filename>LIC_FILES_CHKSUM</filename>.
+                The previous example employs the default directory.
+            </para>
+
+            <para>
+                You can also use relative paths as shown in the following example: 
+                <literallayout class='monospaced'>
+     LIC_FILES_CHKSUM = "file://src/ls.c;startline=5;endline=16;\
+                                         md5=bb14ed3c4cda583abc85401304b5cd4e"
+     LIC_FILES_CHKSUM = "file://../license.html;md5=5c94767cedb5d6987c902ac850ded2c6"
+                </literallayout>
+            </para>
+
+            <para>
+                In this example, the first line locates a file in 
+                <filename><link linkend='var-S'>S</link>/src/ls.c</filename>. 
+                The second line refers to a file in 
+                <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>, which is the parent
+                of <filename>S</filename>.
+            </para>
+            <para>
+                Note that this variable is mandatory for all recipes, unless the 
+                <filename>LICENSE</filename> variable is set to "CLOSED".
+            </para>
+        </section>
+
+        <section id="usingpoky-LIC_FILES_CHKSUM-explanation-of-syntax">
+            <title>Explanation of Syntax</title>
+            <para>
+                As mentioned in the previous section, the 
+                <filename>LIC_FILES_CHKSUM</filename> variable lists all the 
+                important files that contain the license text for the source code. 
+                It is possible to specify a checksum for an entire file, or a specific section of a
+                file (specified by beginning and ending line numbers with the "beginline" and "endline"
+                parameters respectively). 
+                The latter is useful for source files with a license notice header,
+                README documents, and so forth.
+                If you do not use the "beginline" parameter, then it is assumed that the text begins on the 
+                first line of the file. 
+                Similarly, if you do not use the "endline" parameter, it is assumed that the license text 
+                ends with the last line of the file. 
+            </para>
+
+            <para>
+                The "md5" parameter stores the md5 checksum of the license text. 
+                If the license text changes in any way as compared to this parameter
+                then a mismatch occurs.
+                This mismatch triggers a build failure and notifies the developer.
+                Notification allows the developer to review and address the license text changes.
+                Also note that if a mismatch occurs during the build, the correct md5 
+                checksum is placed in the build log and can be easily copied to the recipe.
+            </para>
+
+            <para>
+                There is no limit to how many files you can specify using the 
+                <filename>LIC_FILES_CHKSUM</filename> variable.
+                Generally, however, every project requires a few specifications for license tracking. 
+                Many projects have a "COPYING" file that stores the license information for all the source 
+                code files.
+                This practice allows you to just track the "COPYING" file as long as it is kept up to date. 
+            </para>
+
+            <tip>
+                If you specify an empty or invalid "md5" parameter, BitBake returns an md5 mis-match 
+                error and displays the correct "md5" parameter value during the build. 
+                The correct parameter is also captured in the build log. 
+            </tip>
+
+            <tip>
+                If the whole file contains only license text, you do not need to use the "beginline" and 
+                "endline" parameters. 
+            </tip>
+        </section>
+    </section>
+
+    <section id="usingpoky-configuring-DISTRO_PN_ALIAS">
+        <title>Handling a Package Name Alias</title>
+        <para>
+            Sometimes a package name you are using might exist under an alias or as a similarly named
+            package in a different distribution.
+            The Yocto Project implements a <filename>distro_check</filename>
+            task that automatically connects to major distributions
+            and checks for these situations. 
+            If the package exists under a different name in a different distribution, you get a 
+            <filename>distro_check</filename> mismatch.  
+            You can resolve this problem by defining a per-distro recipe name alias using the 
+            <filename><link linkend='var-DISTRO_PN_ALIAS'>DISTRO_PN_ALIAS</link></filename> variable.
+        </para>
+
+        <para>
+            Following is an example that shows how you specify the <filename>DISTRO_PN_ALIAS</filename>
+            variable:
+            <literallayout class='monospaced'>
+     DISTRO_PN_ALIAS_pn-PACKAGENAME = "distro1=package_name_alias1 \
+                                       distro2=package_name_alias2 \
+                                       distro3=package_name_alias3 \
+                                       ..."
+            </literallayout>
+        </para>
+        
+        <para>
+            If you have more than one distribution alias, separate them with a space.
+            Note that the Yocto Project currently automatically checks the 
+            Fedora, OpenSuSE, Debian, Ubuntu, 
+            and Mandriva distributions for source package recipes without having to specify them 
+            using the <filename>DISTRO_PN_ALIAS</filename> variable.
+            For example, the following command generates a report that lists the Linux distributions
+            that include the sources for each of the Yocto Project recipes.
+            <literallayout class='monospaced'>
+     $ bitbake world -f -c distro_check
+            </literallayout>
+            The results are stored in the <filename>build/tmp/log/distro_check-${DATETIME}.results</filename> 
+            file found in the Yocto Project files area.
+        </para>
+    </section>
 </chapter>
 
 <!-- 

documentation/poky-ref-manual/faq.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='faq'>
 <title>FAQ</title>
@@ -8,14 +7,14 @@
     <qandaentry>
         <question>
             <para>
-                How does Poky differ from <ulink url='&OE_HOME_URL;'>OpenEmbedded</ulink>?
+                How does Poky differ from <ulink url='http://www.openembedded.org/'>OpenEmbedded</ulink>?
             </para>
         </question>
         <answer>
             <para>
                 Poky is the Yocto Project build system that was derived from <ulink 
-                url='&OE_HOME_URL;'>OpenEmbedded</ulink>.
-                Poky is a stable, smaller subset focused on the mobile environment. 
+                url='http://www.openembedded.org/'>OpenEmbedded</ulink>.
+                Poky is a stable, smaller subset focused on the GNOME Mobile environment. 
                 Development in the Yocto Project using Poky is closely tied to OpenEmbedded with 
                 features being merged regularly between the two for mutual benefit.
             </para>
@@ -34,8 +33,8 @@
                 You can use a stand-alone tarball to provide Python 2.6.
                 You can find pre-built 32 and 64-bit versions of Python 2.6 at the following locations:
                 <itemizedlist>
-                    <listitem><para><ulink url='&YOCTO_PYTHON-i686_DL_URL;'>32-bit tarball</ulink></para></listitem>
-                    <listitem><para><ulink url='&YOCTO_PYTHON-x86_64_DL_URL;'>64-bit tarball</ulink></para></listitem>
+                    <listitem><para><ulink url='http://autobuilder.yoctoproject.org/downloads/miscsupport/yocto-1.0-python-nativesdk/python-nativesdk-standalone-i686.tar.bz2'>32-bit tarball</ulink></para></listitem>
+                    <listitem><para><ulink url='http://autobuilder.yoctoproject.org/downloads/miscsupport/yocto-1.0-python-nativesdk/python-nativesdk-standalone-x86_64.tar.bz2'>64-bit tarball</ulink></para></listitem>
                 </itemizedlist>
             </para>
             <para>
@@ -140,7 +139,7 @@
             <para>
                 To add a package, you need to create a BitBake recipe.
                 For information on how to add a package, see the 
-                "<link linkend='usingpoky-extend-addpkg'>Adding a Package</link>" section
+                <link linkend='usingpoky-extend-addpkg'>Adding a Package</link> section
                 earlier in this manual.
             </para>
         </answer>
@@ -172,7 +171,7 @@
         </question>
         <answer>
             <para>
-                GNOME Mobile is a subset of the <ulink url='http://www.gnome.org'>GNOME</ulink> 
+                <ulink url='http://www.gnome.org/mobile/'>GNOME Mobile</ulink> is a subset of the GNOME 
                 platform targeted at mobile and embedded devices. 
                 The the main difference between GNOME Mobile and standard GNOME is that 
                 desktop-orientated libraries have been removed, along with deprecated libraries, 
@@ -238,7 +237,7 @@
         <question>
             <para>
                 I see lots of 404 responses for files on 
-                <filename>http://www.yoctoproject.org/sources/*</filename>. Is something wrong?
+                <filename>http://autobuilder.yoctoproject.org/sources/*</filename>. Is something wrong?
             </para>
         </question>
         <answer>
@@ -386,9 +385,9 @@
         </question>
         <answer>
             <para>
-                You need to create a form factor file as described in the
-                "<link linkend='bsp-filelayout-misc-recipes'>Miscellaneous Recipe Files</link>"
-                section and set the <filename>HAVE_TOUCHSCREEN</filename> variable equal to one as follows:
+                You need to create a form factor file as described in 
+                <xref linkend='bsp-filelayout-misc-recipes'>"Miscellaneous Recipe Files"</xref>
+                and set the <filename>HAVE_TOUCHSCREEN</filename> variable equal to one as follows:
                 <literallayout class='monospaced'>
      HAVE_TOUCHSCREEN=1
                 </literallayout>
@@ -408,8 +407,8 @@
                 automatically bring up network interfaces. 
                 Therefore, you will need to add a BSP-specific netbase that includes an interfaces 
                 file.
-                See the "<link linkend='bsp-filelayout-misc-recipes'>Miscellaneous Recipe Files</link>"
-                section for information on creating these types of miscellaneous recipe files.
+                See <xref linkend='bsp-filelayout-misc-recipes'>"Miscellaneous Recipe Files"</xref>
+                for information on creating these types of miscellaneous recipe files.
             </para>
             <para>
                 For example, add the following files to your layer:
@@ -494,8 +493,8 @@
 
     <qandaentry>
         <question>
-            <para id='how-does-the-yocto-project-obtain-source-code-and-will-it-work-behind-my-firewall-or-proxy-server'>
-                How does the Yocto Project build system obtain source code and will it work behind my 
+            <para>
+                How does the Yocto Project obtain source code and will it work behind my 
                 firewall or proxy server?
             </para>
         </question>
@@ -521,10 +520,10 @@
                 configuration file:
                 <literallayout class='monospaced'>
      PREMIRRORS_prepend = "\
-     git://.*/.* http://www.yoctoproject.org/sources/ \n \
-     ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
-     http://.*/.* http://www.yoctoproject.org/sources/ \n \
-     https://.*/.* http://www.yoctoproject.org/sources/ \n"
+     git://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
+     ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
+     http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
+     https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n"
                 </literallayout>
             </para>
             <para>
@@ -565,16 +564,16 @@
                  configuration file as long as the PREMIRROR server is up to date:
                  <literallayout class='monospaced'>
      PREMIRRORS_prepend = "\
-     ftp://.*/.* http://www.yoctoproject.org/sources/ \n \
-     http://.*/.* http://www.yoctoproject.org/sources/ \n \
-     https://.*/.* http://www.yoctoproject.org/sources/ \n"
+     ftp://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
+     http://.*/.* http://autobuilder.yoctoproject.org/sources/ \n \
+     https://.*/.* http://autobuilder.yoctoproject.org/sources/ \n"
      BB_FETCH_PREMIRRORONLY = "1" 
                  </literallayout>
                  These changes would cause Poky to successfully fetch source over HTTP and 
                  any network accesses to anything other than the PREMIRROR would fail.
              </para>
              <para>
-                 Poky also honors the standard shell environment variables 
+                 Poky also honors the standard environment variables 
                  <filename>http_proxy</filename>, <filename>ftp_proxy</filename>, 
                  <filename>https_proxy</filename>, and <filename>all_proxy</filename>
                  to redirect requests through proxy servers.

documentation/poky-ref-manual/introduction.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <chapter id='intro'>
 <title>Introduction</title>
@@ -16,13 +15,10 @@
         construct complete Linux images.
         You can find complete introductory and getting started information on the Yocto Project
         by reading the 
-        <ulink url='&YOCTO_DOCS_QS_URL;'>   
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>   
         Yocto Project Quick Start</ulink>.
-        For task-based information using the Yocto Project, see 
-        <ulink url='&YOCTO_DOCS_DEV_URL;'>
-        The Yocto Project Development Manual</ulink>.
         You can also find lots of information on the Yocto Project on the 
-        <ulink url="&YOCTO_HOME_URL;">Yocto Project website</ulink>.
+        <ulink url="http://www.yoctoproject.org">Yocto Project website</ulink>.
     </para>
 </section>
 
@@ -40,11 +36,6 @@
                 <link linkend='extendpoky'>Extending the Yocto Project</link>:</emphasis> This chapter
                 provides information about how to extend and customize the Yocto Project 
                 along with advice on how to manage these changes.</para></listitem>
-            <listitem><para><emphasis>
-                <link linkend='technical-details'>Technical Details</link>:</emphasis> 
-                This chapter describes fundamental Yocto Project components as well as an explanation
-                behind how the Yocto Project uses shared state (sstate) cache to speed build time.
-                </para></listitem>
             <listitem><para><emphasis>
                 <link linkend='bsp'>Board Support Packages (BSP) - Developer's Guide</link>:</emphasis> 
                 This chapter describes the example filesystem layout for BSP development and 
@@ -98,9 +89,11 @@
 <section id='intro-requirements'>
 <title>System Requirements</title>
     <para>
-        For Yocto Project system requirements, see the
-        <ulink url='&YOCTO_DOCS_QS_URL;#resources'>
-        What You Need and How You Get It</ulink> section in the Yocto Project Quick Start.
+        For system Yocto Project system requirements, see the 
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#resources'>
+        What You Need and How You Get It</ulink> section in the 
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+        Yocto Project Quick Start</ulink>.
     </para>
 </section>
 
@@ -111,14 +104,14 @@
         of methods:
         <itemizedlist>
             <listitem><para><emphasis>Releases:</emphasis> Stable, tested releases are available through 
-                <ulink url='&YOCTO_DL_URL;/releases/yocto/'/>.</para></listitem>
+                <ulink url='http://yoctoproject.org/downloads/poky/'/>.</para></listitem>
             <listitem><para><emphasis>Nightly Builds:</emphasis> These releases are available at
-                <ulink url='http://autobuilder.yoctoproject.org/nightly'/>.  
+                <ulink url='http://autobuilder.yoctoproject.org/'/>.  
                 These builds include Yocto Project releases, meta-toolchain tarballs, and 
                 experimental builds.</para></listitem>
             <listitem><para><emphasis>Yocto Project Website:</emphasis> You can find releases
                 of the Yocto Project and supported BSPs at the
-                <ulink url='&YOCTO_HOME_URL;'>Yocto Project website</ulink>.
+                <ulink url='http://www.yoctoproject.org'>Yocto Project website</ulink>.
                 Along with these downloads, you can find lots of other information at this site.  
                 </para></listitem>
         </itemizedlist>
@@ -131,9 +124,11 @@
         Development using the Yocto Project requires a local copy of the Yocto Project files. 
         You can get these files by downloading a Yocto Project release tarball and unpacking it,  
         or by establishing a Git repository of the files.
-        For information on both these methods, see the
-        "<ulink url='&YOCTO_DOCS_DEV_URL;#getting-setup'>Getting Setup</ulink>" 
-        section in The Yocto Project Development Manual.
+        For information on both these methods, see
+        <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#getting-setup'>
+        Getting Setup</ulink> section in  
+        <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
+        The Yocto Project Development Manual</ulink>.
     </para>
 </section>
 

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

@@ -1,6 +1,5 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <book id='poky-ref-manual' lang='en' 
       xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -27,7 +26,7 @@
                 <email>richard.purdie@linuxfoundation.org</email>
             </author>
 
-<!--            <author>
+            <author>
                 <firstname>Tomas</firstname> <surname>Frydrych</surname>
                 <affiliation>
                     <orgname>Intel Corporation</orgname>
@@ -39,44 +38,29 @@
             </author>
             <author>
                 <firstname>Dodji</firstname> <surname>Seketeli</surname>
-            </author> -->
+            </author>
         </authorgroup>
 
         <revhistory>
             <revision>
                 <revnumber>4.0+git</revnumber>
                 <date>24 November 2010</date>
-                <revremark>Released with the Yocto Project 0.9 Release</revremark>
+                <revremark>Poky Master Documentation</revremark>
             </revision>
             <revision>
-                <revnumber>1.0</revnumber>
+                <revnumber>5.0+git</revnumber>
                 <date>6 April 2011</date>
-                <revremark>Released with the Yocto Project 1.0 Release.</revremark>
+                <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 the Yocto Project 1.0.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1</revnumber>
-                <date>6 October 2011</date>
-                <revremark>Released with the Yocto Project 1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.1</revnumber>
-                <date>15 March 2012</date>
-                <revremark>Released with the Yocto Project 1.1.1 Release.</revremark>
-            </revision>
-            <revision>
-                <revnumber>1.1.2</revnumber>
-                <date>July 2012</date>
-                <revremark>Released with the Yocto Project 1.1.2 Release.</revremark>
+                <revremark>Released with Yocto Project 1.0.1 on 23 May 2011.</revremark>
             </revision>
         </revhistory>
 
     <copyright>
-      <year>&COPYRIGHT_YEAR;</year>
+      <year>2007-2011</year>
       <holder>Linux Foundation</holder>
     </copyright>
 
@@ -88,9 +72,9 @@
       <note>
           Due to production processes, there could be differences between the Yocto Project
           documentation bundled in the release tarball and 
-          <ulink url='&YOCTO_DOCS_REF_URL;'>
+          <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
           The Yocto Project Reference Manual</ulink> on
-          the <ulink url='&YOCTO_HOME_URL;'>Yocto Project</ulink> website.
+          the <ulink url='http://www.yoctoproject.org'>Yocto Project</ulink> website.
           For the latest version of this manual, see the manual on the website.
       </note>
     </legalnotice>
@@ -103,8 +87,6 @@
 
     <xi:include href="extendpoky.xml"/>
 
-    <xi:include href="technical-details.xml"/>
-
     <xi:include href="../bsp-guide/bsp.xml"/>
 
     <xi:include href="development.xml"/>

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

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='ref-bitbake'>
 
@@ -36,7 +35,7 @@
             The first thing BitBake does is look for the <filename>bitbake.conf</filename> file.
             The Yocto Project keeps this file in the Yocto Project file's <filename>meta/conf/</filename>
             directory.
-            BitBake finds it by examining its <filename>BBPATH</filename> environment 
+            BitBake finds it by examining the <filename>BBPATH</filename> environment 
             variable and looking for the <filename>meta/conf/</filename> 
             directory.
         </para>
@@ -54,7 +53,7 @@
             and the machine configuration file 
             (set by the 
             <filename><link linkend='var-MACHINE'>MACHINE</link></filename> variable).  
-            The <filename>DISTRO</filename> and <filename>MACHINE</filename> BitBake environment 
+            The <filename>DISTRO</filename> and <filename>MACHINE</filename> environment 
             variables are both usually set in 
             the <filename>local.conf</filename> file. 
             Valid distribution 
@@ -87,7 +86,7 @@
             <filename>meta/recipes-*/</filename> directory within Poky. 
             Adding extra content to <filename>BBFILES</filename> is best achieved through the use of 
             BitBake layers as described in the 
-            "<link linkend='usingpoky-changes-layers'>BitBake Layers</link>" section.
+            <link linkend='usingpoky-changes-layers'>BitBake Layers</link> section.
         </para>
 
         <para>
@@ -123,7 +122,7 @@
             <filename>task-base.bb</filename>,  
             which in turn leads to packages like <filename>Contacts</filename>, 
             <filename>Dates</filename> and <filename>BusyBox</filename>.
-            These packages in turn depend on <filename>eglibc</filename> and the toolchain.
+            These packages in turn depend on glibc and the toolchain.
         </para>
 
         <para>
@@ -208,16 +207,17 @@
             It is worth noting that you can greatly speed up the build time by properly setting 
             the <filename>BB_NUMBER_THREADS</filename> variable.  
             See the
-            "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>"
-            section in the Yocto Project Quick Start for more information.
+            <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>
+            Building an Image</ulink> section in the 
+            <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+            Yocto Project Quick Start</ulink> for more information.
         </para>
 
         <para>
             As each task completes, a timestamp is written to the directory specified by the 
             <filename><link linkend='var-STAMPS'>STAMPS</link></filename> variable (usually 
             <filename>build/tmp/stamps/*/</filename>). 
-            On subsequent runs, BitBake looks at the <filename>/build/tmp/stamps</filename>
-            directory and does not rerun
+            On subsequent runs, BitBake looks at the <filename>STAMPS</filename> directory and does not rerun 
             tasks that are already completed unless a timestamp is found to be invalid. 
             Currently, invalid timestamps are only considered on a per 
             <filename>.bb</filename> file basis.
@@ -260,51 +260,9 @@
         <para>
             Once all the tasks have been completed BitBake exits.
         </para> 
-
-        <para>
-            When running a task, BitBake tightly controls the execution environment 
-            of the build tasks to make sure unwanted contamination from the build machine
-            cannot influence the build. 
-            Consequently, if you do want something to get passed into the build 
-            task's environment, you must take a few steps:
-            <orderedlist>
-                <listitem><para>Tell BitBake to load what you want from the environment
-                    into the data store. 
-                    You can do so through the <filename>BB_ENV_WHITELIST</filename>
-                    variable.
-                    For example, assume you want to prevent the build system from 
-                    accessing your <filename>$HOME/.ccache</filename> directory.
-                    The following command tells BitBake to load 
-                    <filename>CCACHE_DIR</filename> from the environment into the data
-                    store:
-                    <literallayout class='monospaced'>
-     export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE CCACHE_DIR" 
-                    </literallayout></para></listitem>
-                <listitem><para>Tell BitBake to export what you have loaded into the 
-                    environment store to the task environment of every running task.
-                    Loading something from the environment into the data store
-                    (previous step) only makes it available in the datastore. 
-                    To export it to the task environment of every running task,
-                    use a command similar to the following in your 
-                    <filename>local.conf</filename> or distro configuration file:
-                    <literallayout class='monospaced'>
-     export CCACHE_DIR
-                    </literallayout></para></listitem>
-            </orderedlist>
-        </para>
-
-        <note>
-            A side effect of the previous steps is that BitBake records the variable
-            as a dependency of the build process in things like the shared state
-            checksums. 
-            If doing so results in unnecessary rebuilds of tasks, you can whitelist the 
-            variable so that the shared state code ignores the dependency when it creates
-            checksums.
-            For information on this process, see the <filename>BB_HASHBASE_WHITELIST</filename>
-            example in the "<link linkend='checksums'>Checksums (Signatures)</link>" section.
-        </note>
     </section>
 
+
     <section id='ref-bitbake-commandline'>
         <title>BitBake Command Line</title>
 
@@ -401,8 +359,8 @@ Options:
             This feature works using the <filename><link linkend='var-SRCREV'>SRCREV</link></filename> 
             variable. 
             See the 
-            "<link linkend='platdev-appdev-srcrev'>Development Within Yocto Project for a Package that Uses 
-            an External SCM</link>" section for more information.
+            <link linkend='platdev-appdev-srcrev'>Development Within Yocto Project for a Package that Uses 
+            an External SCM</link> section for more information.
         </para>
 
     </section>

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

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='ref-classes'>
 <title>Reference: Classes</title>
@@ -50,7 +49,7 @@
         This class defines a set of tasks (configure, compile etc.) that 
         work for all Autotooled packages.  
         It should usually be enough to define a few standard variables as documented in the 
-        "<link linkend='usingpoky-extend-addpkg-autotools'>Autotooled Package</link>" section 
+        <link linkend='usingpoky-extend-addpkg-autotools'>Autotooled Package</link> section 
         and then simply <filename>inherit autotools</filename>. 
         This class can also work with software that emulates Autotools.
     </para>
@@ -140,7 +139,7 @@
     </para>
 
     <para>
-        During staging, BitBake installs such scripts into the
+        During staging, Bitbake installs such scripts into the 
         <filename>sysroots/</filename> directory. 
         BitBake also changes all paths to point into the <filename>sysroots/</filename>
         directory so all builds that use the script will use the correct 
@@ -153,8 +152,8 @@
 
     <para>
         This class renames packages so that they follow the Debian naming
-        policy (i.e. <filename>eglibc</filename> becomes <filename>libc6</filename>
-        and <filename>eglibc-devel</filename> becomes <filename>libc6-dev</filename>.
+        policy (i.e. <filename>glibc</filename> becomes <filename>libc6</filename>
+        and <filename>glibc-devel</filename> becomes <filename>libc6-dev</filename>.
     </para>
 </section>
 
@@ -167,7 +166,7 @@
     </para>
 
     <para>
-        During staging, BitBake installs <filename>pkg-config</filename> data into the
+        During staging, Bitbake installs <filename>pkg-config</filename> data into the 
         <filename>sysroots/</filename> directory. 
         By making use of sysroot functionality within <filename>pkg-config</filename>,
         this class no longer has to manipulate the files.
@@ -253,8 +252,8 @@
     <para>
         This class adds the <filename>devshell</filename> task. 
         Distribution policy dictates whether to include this class as the Yocto Project does.
-        See the 
-        "<link linkend='platdev-appdev-devshell'>Development Within a Development Shell</link>" section 
+        See the <link 
+        linkend='platdev-appdev-devshell'>Development Within a Development Shell</link> section 
         for more information about using devshell.
     </para>
 </section>
@@ -314,9 +313,9 @@
         You can find additional information on the effects of the package class at these 
         two Yocto Project mailing list links:
         <itemizedlist>
-            <listitem><para><ulink url='&YOCTO_LISTS_URL;/pipermail/poky/2011-May/006362.html'>
+            <listitem><para><ulink url='https://lists.yoctoproject.org/pipermail/poky/2011-May/006362.html'>
                 https://lists.yoctoproject.org/pipermail/poky/2011-May/006362.html</ulink></para></listitem>
-            <listitem><para><ulink url='&YOCTO_LISTS_URL;/pipermail/poky/2011-May/006363.html'>
+            <listitem><para><ulink url='https://lists.yoctoproject.org/pipermail/poky/2011-May/006363.html'>
                 https://lists.yoctoproject.org/pipermail/poky/2011-May/006363.html</ulink></para></listitem>
         </itemizedlist>
     </para>
@@ -388,91 +387,10 @@
     <para>
         This class adds a step to the package generation process that sanity checks the
         packages generated by the Yocto Project.
-        A range of checks are performed that check the build's output
-        for common problems that show up during runtime.
+        An ever-increasing range of checks are performed that check for 
+        common problems that break builds.
         Distribution policy usually dictates whether to include this class as the Yocto Project does.
     </para>
-
-    <para>
-        You can configure the sanity checks so that specific test failures either raise a warning or 
-        an error message.  
-        Typically, failures for new tests generate a warning.
-        Subsequent failures for the same test would then generate an error message 
-        once the metadata is in a known and good condition.
-        You use the <filename>WARN_QA</filename> variable to specify tests for which you 
-        want to generate a warning message on failure.
-        You use the <filename>ERROR_QA</filename> variable to specify tests for which you 
-        want to generate an error message on failure.
-    </para>
-
-    <para>
-        The following list shows the tests you can list with the <filename>WARN_QA</filename>
-        and <filename>ERROR_QA</filename> variables:
-        <itemizedlist>
-            <listitem><para><emphasis><filename>ldflags:</filename></emphasis>
-                Ensures that the binaries were linked with the 
-                <filename>LDFLAGS</filename> options provided by the build system. 
-                If this test fails, check that the <filename>LDFLAGS</filename> variable
-                is being passed to the linker command.</para></listitem>
-            <listitem><para><emphasis><filename>useless-rpaths:</filename></emphasis>
-                Checks for dynamic library load paths (rpaths) in the binaries that 
-                by default on a standard system are searched by the linker (e.g.
-                <filename>/lib</filename> and <filename>/usr/lib</filename>). 
-                While these paths will not cause any breakage, they do waste space and 
-                are unnecessary.</para></listitem>
-            <listitem><para><emphasis><filename>rpaths:</filename></emphasis>
-                Checks for rpaths in the binaries that contain build system paths such
-                as <filename>TMPDIR</filename>.
-                If this test fails, bad <filename>-rpath</filename> options are being 
-                passed to the linker commands and your binaries have potential security 
-                issues.</para></listitem>
-            <listitem><para><emphasis><filename>dev-so:</filename></emphasis>
-                Checks that the <filename>.so</filename> symbolic links are in the 
-                <filename>-dev</filename> package and not in any of the other packages. 
-                In general, these symlinks are only useful for development purposes.
-                Thus, the <filename>-dev</filename> package is the correct location for
-                them. 
-                Some very rare cases do exist for dynamically loaded modules where 
-                these symlinks are needed instead in the main package.
-                </para></listitem>
-            <listitem><para><emphasis><filename>debug-files:</filename></emphasis>
-                Checks for <filename>.debug</filename> directories in anything but the 
-                <filename>-dbg</filename> package. 
-                The debug files should all be in the <filename>-dbg</filename> package.
-                Thus, anything packaged elsewhere is incorrect packaging.</para></listitem>
-            <listitem><para><emphasis><filename>arch:</filename></emphasis>
-                Checks the Executable and Linkable Format (ELF) type, bit size and endianness 
-                of any binaries to ensure it matches the target architecture. 
-                This test fails if any binaries don't match the type since there would be an 
-                incompatibility. 
-                Sometimes software, like bootloaders, might need to bypass this check.
-                </para></listitem>
-            <listitem><para><emphasis><filename>debug-deps:</filename></emphasis>
-                Checks that <filename>-dbg</filename> packages only depend on other
-                <filename>-dbg</filename> packages and not on any other types of packages,
-                which would cause a packaging bug.</para></listitem>
-            <listitem><para><emphasis><filename>dev-deps:</filename></emphasis>
-                Checks that <filename>-dev</filename> packages only depend on other 
-                <filename>-dev</filename> packages and not on any other types of packages,
-                which would be a packaging bug.</para></listitem>
-            <listitem><para><emphasis><filename>pkgconfig:</filename></emphasis>
-                Checks <filename>.pc</filename> files for any 
-                <filename>TMPDIR/WORKDIR</filename> paths. 
-                Any <filename>.pc</filename> file containing these paths is incorrect 
-                since <filename>pkg-config</filename> itself adds the correct sysroot prefix 
-                when the files are accessed.</para></listitem>
-            <listitem><para><emphasis><filename>la:</filename></emphasis>
-                Checks <filename>.la</filename> files for any <filename>TMPDIR</filename>
-                paths. 
-                Any <filename>.la</filename> file continaing these paths is incorrect since 
-                <filename>libtool</filename> adds the correct sysroot prefix when using the 
-                files automatically itself.</para></listitem>
-            <listitem><para><emphasis><filename>desktop:</filename></emphasis>
-                Runs the <filename>desktop-file-validate</filename> program against any 
-                <filename>.desktop</filename> files to validate their contents against 
-                the specification for <filename>.desktop</filename> files.</para></listitem>
-        </itemizedlist>
-    </para>
 </section>
 
 <section id='ref-classes-siteinfo'>
@@ -485,7 +403,7 @@
         still make the correct values available.
         The <filename><link linkend='structure-meta-site'>meta/site directory</link></filename>
         contains test results sorted into different categories such as architecture, endianness, and
-        the <filename>libc</filename> used. 
+        the libc used. 
         Site information provides a list of files containing data relevant to 
         the current build in the 
         <filename><link linkend='var-CONFIG_SITE'>CONFIG_SITE</link></filename> variable 
@@ -504,21 +422,6 @@
     </para>
 </section>
 
-<section id='ref-classes-useradd'>
-    <title>Adding Users - <filename>useradd.bbclass</filename></title>
-
-    <para>
-        If you have packages that install files that are owned by custom users or groups, 
-        you can use this class to specify those packages and associate the users and groups
-        with those packages.
-        The <filename>meta-skeleton/recipes-skeleton/useradd/useradd-example.bb</filename> 
-        recipe in the Yocto Project Files provides a simple exmample that shows how to add three 
-        users and groups to two packages.
-        See the <filename>useradd-example.bb</filename> for more information on how to 
-        use this class.
-    </para>
-</section>
-
 <section id='ref-classes-others'>
     <title>Other Classes</title>
 
@@ -533,71 +436,44 @@
 </section>
 
 <!-- Undocumented classes are:
-        allarch.bbclass
-        binconfig.bbclass
+        base_srpm.bbclass
         bootimg.bbclass
-        buildstats.bbclass
         ccache.inc
+        ccdv.bbclass
         cmake.bbclass
         cml1.bbclass
         cross.bbclass
-        cross-canadian.bbclass
-        deploy.bbclass
-        distrodata.bbclass
+        flow-lossage.bbclass
         gconf.bbclass
         gettext.bbclass
         gnome.bbclass
-        gtk-doc.bbclass
         gtk-icon-cache.bbclass
         icecc.bbclass
-        image-mklibs.bbclass
-        image-prelink.bbclass
-        image-swab.bbclass
-        imagetest-dummy.bbclass
-        imagetest-qemu.bbclass
-        insserv.bbclass
         lib_package.bbclass
-        license.bbclass
-        logging.bbclass
-        meta.bbclass
-        metadata_scm.bbclass
         mirrors.bbclass
-        multilib*.bbclass
+        mozilla.bbclass
+        multimachine.bbclass
         native.bbclass
-        nativesdk.bbclass
         oelint.bbclass
-        own-mirrors.bbclass
-        packagedata.bbclass
-        packagehistory.bbclass
         patch.bbclass
-        perlnative.bbclass
+        patcher.bbclass
         pkg_distribute.bbclass
         pkg_metainfo.bbclass
-        populate_sdk*.bbclass
-        prserv.bbclass
-        python-dir.bbclass
-        qemu.bbclass
-        qmake*.bbclass
-        qt4*.bbclass
-        recipe_sanity.bbclass
-        relocatable.bbclass
+        poky.bbclass
         rm_work.bbclass
+        rpm_core.bbclass
         scons.bbclass
+        sdk.bbclass
         sdl.bbclass
-        setuptools.bbclass
         sip.bbclass
-        siteconfig.bbclass
         sourcepkg.bbclass
-        sstate.bbclass
-        staging.bbclass
+        srec.bbclass
         syslinux.bbclass
-        task.bbclass
-        terminal.bbclass
         tinderclient.bbclass
-        toolchain-scripts.bbclass
-        typecheck.bbclass
-        utility-tasks.bbclass
+        tmake.bbclass
         utils.bbclass
+        xfce.bbclass
+        xlibs.bbclass
 -->
 
 

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

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='ref-features'>
     <title>Reference: Features</title>

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

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='ref-images'>
     <title>Reference: Images</title>
@@ -46,10 +45,7 @@
         <listitem><para><emphasis><filename>core-image-minimal</filename>:</emphasis>
             A small image just capable of allowing a device to boot.</para></listitem>
         <listitem><para><emphasis><filename>core-image-minimal-dev</filename>:</emphasis>
-            A <filename>core-image-minimal</filename> image suitable for development work
-            using the host.
-            The image includes headers and libraries you can use in a host development 
-            environment.
+            A <filename>core-image-minimal</filename> image suitable for development work.
             </para></listitem>
         <listitem><para><emphasis><filename>core-image-minimal-initramfs</filename>:</emphasis>
             A <filename>core-image-minimal</filename> image that has the Minimal RAM-based 
@@ -68,17 +64,13 @@
             A <filename>core-image-basic</filename> image suitable for implementations 
             that conform to Linux Standard Base (LSB).</para></listitem>
         <listitem><para><emphasis><filename>core-image-lsb-dev</filename>:</emphasis>
-            A <filename>core-image-lsb</filename> image that is suitable for development work
-            using the host.
-            The image includes headers and libraries you can use in a host development 
-            environment.
+            A <filename>core-image-lsb</filename> image that is suitable for development work.
             </para></listitem>
         <listitem><para><emphasis><filename>core-image-lsb-sdk</filename>:</emphasis>
             A <filename>core-image-lsb</filename> that includes everything in meta-toolchain 
-            but also includes development headers and libraries to form a complete standalone SDK.
-            This image is suitable for development using the target. 
-            See the "<link linkend='platdev-appdev-external-sdk'> 
-            External Development Using the Poky SDK</link>" section for more information.
+            but also includes development headers and libraries to form a complete standalone SDK. 
+            See the <link linkend='platdev-appdev-external-sdk'> 
+            External Development Using the Poky SDK</link> section for more information.
             </para></listitem>
         <listitem><para><emphasis><filename>core-image-clutter</filename>:</emphasis>
             An image with support for the Open GL-based toolkit Clutter, which enables development of 
@@ -89,17 +81,16 @@
             The image supports X11 with a Sato theme and Pimlico applications and also  
             contains terminal, editor, and file manager.</para></listitem>
         <listitem><para><emphasis><filename>core-image-sato-dev</filename>:</emphasis>
-            A <filename>core-image-sato</filename> image suitable for development 
-            using the host.
-            The image includes libraries needed to build applications on the device itself, 
-            testing and profiling tools, and debug symbols.  
+            A <filename>core-image-sato</filename> image suitable for development
+            that 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 <filename>core-image-sdk</filename>.</para></listitem>
         <listitem><para><emphasis><filename>core-image-sato-sdk</filename>:</emphasis>
             A <filename>core-image-sato</filename> image that includes everything in meta-toolchain. 
-            The image also includes development headers and libraries to form a complete standalone SDK
-            and is suitable for development using the target. 
-            See the "<link linkend='platdev-appdev-external-sdk'> 
-            External Development Using the Poky SDK</link>" section for more information.
+            The image also includes development headers and libraries to form a complete standalone SDK. 
+            See the <link linkend='platdev-appdev-external-sdk'> 
+            External Development Using the Poky SDK</link> section for more information.
             </para></listitem>
     </itemizedlist>
 

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

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='ref-structure'>
 
@@ -15,8 +14,10 @@
 
 <para>
     For information on how to establish the Yocto Project files on your local development system, see the
-    "<ulink url='&YOCTO_DOCS_DEV_URL;#getting-setup'>Getting Set Up</ulink>"
-    section in the Yocto Project Development Manual.
+    <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#getting-started'> 
+    Getting Setup</ulink> section in the 
+    <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
+    The Yocto Project Development Manual</ulink>.
 </para>
 
 <section id='structure-core'>
@@ -34,7 +35,7 @@
             from BitBake itself.
             Consequently, most users do not need to worry about BitBake.
             The <filename>bitbake/bin/</filename> directory is placed 
-            into the shell's <filename>PATH</filename> environment variable by the 
+            into the <filename>PATH</filename> environment variable by the 
             <link linkend="structure-core-script">oe-init-build-env</link> script.
         </para>
 
@@ -120,7 +121,7 @@
             This directory contains various integration scripts that implement 
             extra functionality in the Yocto Project environment (e.g. QEMU scripts).
             The <link linkend="structure-core-script">oe-init-build-env</link> script appends this
-            directory to the shell's <filename>PATH</filename> environment variable.
+            directory to the <filename>PATH</filename> environment variable.
         </para>
 
         <para>
@@ -362,7 +363,7 @@
 
         <para>
             This directory contains intermediate packaging data that is used later in the packaging process. 
-            For more information, see the "<link linkend='ref-classes-package'>Packaging - package*.bbclass</link>" section.
+            For more information, see <link linkend='ref-classes-package'>package.bbclass</link>.
         </para>
     </section>
 
@@ -387,8 +388,8 @@
             referred to as <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>, is created.  
             Within this directory, the source is unpacked to 
             <filename>linux-qemux86-standard-build</filename> and then patched by Quilt 
-            (see the "<link linkend="usingpoky-modifying-packages-quilt">Modifying Package Source Code
-            With Quilt</link>" section).   
+            (see the <link linkend="usingpoky-modifying-packages-quilt">Modifying Package Source Code
+            With Quilt</link> section).   
             Within the <filename>linux-qemux86-standard-build</filename> directory, 
             standard Quilt directories <filename>linux-3.0/patches</filename>
             and <filename>linux-3.0/.pc</filename> are created,
@@ -479,8 +480,8 @@
         <title><filename>meta/recipes-bsp/</filename></title>
 
         <para>
-            This directory contains anything linking to specific hardware or hardware 
-            configuration information such as "u-boot" and "grub".
+            This directory contains anything linking to specific hardware or hardware configuration information
+            such as "u-boot" and "grub".
         </para>
     </section>
 

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

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!-- Dummy chapter -->
 <appendix id='ref-variables-glos'>
@@ -17,7 +16,7 @@
 
     <para>
        <link linkend='var-AUTHOR'>A</link> 
-       <link linkend='var-BAD_RECOMMENDATIONS'>B</link> 
+       <link linkend='var-BB_NUMBER_THREADS'>B</link> 
        <link linkend='var-CFLAGS'>C</link> 
        <link linkend='var-D'>D</link> 
        <link linkend='var-ENABLE_BINARY_LOCALE_GENERATION'>E</link> 
@@ -26,7 +25,7 @@
        <link linkend='var-HOMEPAGE'>H</link> 
        <link linkend='var-IMAGE_FEATURES'>I</link> 
 <!--               <link linkend='var-glossary-j'>J</link> -->
-       <link linkend='var-KERNEL_FEATURES'>K</link>
+       <link linkend='var-KERNEL_IMAGETYPE'>K</link>
        <link linkend='var-LAYERDIR'>L</link> 
        <link linkend='var-MACHINE'>M</link> 
 <!--               <link linkend='var-glossary-n'>N</link> -->
@@ -65,18 +64,10 @@
 
     <glossdiv id='var-glossary-b'><title>B</title>
 
-        <glossentry id='var-BAD_RECOMMENDATIONS'><glossterm>BAD_RECOMMENDATIONS</glossterm>
-            <glossdef>
-                <para>A list of packages not to install despite being recommended by a recipe.
-                    Support for this variable exists only for images that use the 
-                    <filename>ipkg</filename> packaging system.</para>
-            </glossdef>
-        </glossentry>
-
         <glossentry id='var-BB_NUMBER_THREADS'><glossterm>BB_NUMBER_THREADS</glossterm>
             <glossdef>
                 <para>The maximum number of tasks BitBake should run in parallel at any one time.
-                    If your host development system supports multiple cores, a good rule of thumb
+                    If your host development system supports mulitiple cores a good rule of thumb
                     is to set this variable to twice the number of cores.</para>
             </glossdef>
         </glossentry>
@@ -286,7 +277,6 @@
 
         <glossentry id='var-DISTRO_EXTRA_RRECOMMENDS'><glossterm>DISTRO_EXTRA_RRECOMMENDS</glossterm>
             <glossdef>
-                <para></para>
                 <para>The list of packages which extend usability of the image. 
                     Those packages will automatically be installed but can be removed by user.</para>
             </glossdef>
@@ -307,8 +297,8 @@
         <glossentry id='var-DISTRO_PN_ALIAS'><glossterm>DISTRO_PN_ALIAS</glossterm>
             <glossdef>
                 <para>Alias names used for the recipe in various Linux distributions.</para>
-                <para>See "<link linkend='usingpoky-configuring-DISTRO_PN_ALIAS'>
-                    Handling a Package Name Alias</link>" section for more information.</para>
+                <para>See <link linkend='usingpoky-configuring-DISTRO_PN_ALIAS'>
+                    Handling a Package Name Alias</link> section for more information.</para>
             </glossdef>
         </glossentry>
 
@@ -330,8 +320,7 @@
 
         <glossentry id='var-ENABLE_BINARY_LOCALE_GENERATION'><glossterm>ENABLE_BINARY_LOCALE_GENERATION</glossterm>
             <glossdef>
-                <para></para>
-                <para>Variable that controls which locales for <filename>eglibc</filename> are
+                <para>Variable that controls which locales for <filename>glibc</filename> are
                     to be generated during the build (useful if the target device has 64Mbytes
                     of RAM or less).</para>
             </glossdef>
@@ -348,36 +337,34 @@
                     You can use this variable to add more features in addition to those.
                     Here are some examples 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.
+     "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.
+     "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-sdk" - Adds development tools such as gcc, make, 
+                   pkgconfig and so forth.
 
-"tools-debug" - Adds debugging tools such as gdb and 
-                strace.
+     "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-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.
+     "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.  You should remove this feature 
-                 before you produce a production image.  
-                       
-                 There are other application targets too, see
-                 <filename>meta/classes/poky-image.bbclass</filename>
-                 and <filename>meta/packages/tasks/task-poky.bb</filename>
-                 for more details.
+     "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>
@@ -410,44 +397,13 @@
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-FILESYSTEM_PERMS_TABLES'><glossterm>FILESYSTEM_PERMS_TABLES</glossterm>
-            <glossdef>
-                <para>Allows you to define your own file permissions settings table as part of
-                    your configuration for the packaging process.
-                    For example, suppose you need a consistent set of custom permissions for 
-                    a set of groups and users across an entire work project.
-                    It is best to do this in the packages themselves but this is not always 
-                    possible.
-                </para>
-                <para>
-                    By default, the Yocto Project uses the <filename>fs-perms.txt</filename>, which
-                    is located in the <filename>meta/files</filename> directory of the Yocto Project
-                    files directory.
-                    If you create your own file permissions setting table, you should place it in your
-                    layer or the distros layer. 
-                </para>
-                <para>
-                    You define the <filename>FILESYSTEM_PERMS_TABLES</filename> variable in the 
-                    <filename>conf/local.conf</filename> file, which is found in the Yocto Project's 
-                    build directory, to point to your custom <filename>fs-perms.txt</filename>.
-                    You can specify more than a single file permissions setting table.
-                    The paths you specify to these files must be defined within the 
-                    <filename>BBPATH</filename> variable.  
-                </para>
-                <para>
-                    For guidance on how to create your own file permissions settings table file, 
-                    examine the existing <filename>fs-perms.txt</filename>.
-                </para>
-            </glossdef>
-        </glossentry>
-
         <glossentry id='var-FULL_OPTIMIZATION'><glossterm>FULL_OPTIMIZATION</glossterm>
             <glossdef>
                 <para>
                     The options to pass in 
                     <filename><link linkend='var-TARGET_CFLAGS'>TARGET_CFLAGS</link></filename>
                     and <filename><link linkend='var-CFLAGS'>CFLAGS</link></filename>
-                    when compiling an optimized system.
+                    when compiling an optimised system.
                     This variable defaults to 
                     "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2".
                 </para>
@@ -477,7 +433,7 @@
                 Typically, you configure this variable in image recipes.
                 Note that you can add extra features to the image by using the
                 <filename><link linkend='var-EXTRA_IMAGE_FEATURES'>EXTRA_IMAGE_FEATURES</link></filename> variable.
-                See the "<link linkend="ref-features-image">Reference: Images</link>" section for the 
+                See the <link linkend="ref-features-image">Reference: Images</link> section for the 
                 list of features present in images built by the Yocto Project.</para>
             </glossdef>
         </glossentry>
@@ -583,34 +539,6 @@
 
    <glossdiv id='var-glossary-k'><title>K</title>
 
-        <glossentry id='var-KERNEL_FEATURES'><glossterm>KERNEL_FEATURES</glossterm>
-            <glossdef>
-                <para>Includes additional metadata from the Linux Yocto kernel Git repository.
-                    In the Yocto Project build system, the default Board Support Packages (BSPs)
-                    metadata is provided through 
-                    the <filename>KMACHINE</filename> and <filename>KBRANCH</filename> variables.
-                    You can use the <filename>KERNEL_FEATURES</filename> variable to further 
-                    add metadata for all BSPs.</para>
-                <para>The metadata you add through this variable includes config fragments and 
-                    features descriptions,
-                    which usually includes patches as well as config fragments.
-                    You typically override the <filename>KERNEL_FEATURES</filename> variable
-                    for a specific machine.
-                    In this way, you can provide validated, but optional, sets of kernel
-                    configurations and features.</para>
-                <para>For example, the following adds <filename>netfilter</filename> to all 
-                    the Linux Yocto kernels and adds sound support to the <filename>qemux86</filename>
-                    machine:
-                    <literallayout class='monospaced'>
-     # Add netfilter to all linux-yocto kernels
-     KERNEL_FEATURES="features/netfilter"
-
-     # Add sound support to the qemux86 machine
-     KERNEL_FEATURES_append_qemux86="cfg/sound"
-                    </literallayout></para>
-            </glossdef>
-        </glossentry>
-
         <glossentry id='var-KERNEL_IMAGETYPE'><glossterm>KERNEL_IMAGETYPE</glossterm>
             <glossdef>
                 <para>The type of kernel to build for a device, usually set by the 
@@ -679,8 +607,8 @@
                     This variable must be defined for all recipes (unless <filename>LICENSE</filename>
                     is set to "CLOSED")</para>
                 <para>For more information, see the
-                    "<link linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>Track License Change</link>" 
-                    section</para>
+                    <link linkend='usingpoky-configuring-LIC_FILES_CHKSUM'>
+                    Track License Change</link> section</para>
             </glossdef>
         </glossentry>
 
@@ -694,162 +622,36 @@
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'><glossterm>MACHINE_ESSENTIAL_EXTRA_RDEPENDS</glossterm>
+         <glossentry id='var-MACHINE_ESSENTIAL_RDEPENDS'><glossterm>MACHINE_ESSENTIAL_RDEPENDS</glossterm>
             <glossdef>
-                <para></para>
-                <para>
-                    A list of required packages to install as part of the package being
-                    built.
-                    The build process depends on these packages being present.
-                    Furthermore, because this is a "machine essential" variable, the list of 
-                    packages are essential for the machine to boot.
-                    The impact of this variable affects images based on <filename>task-core-boot</filename>,
-                    including the <filename>core-image-minimal</filename> image.
-                </para>
-                <para>
-                    This variable is similar to the 
-                    <filename><link linkend='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'>MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS</link></filename>
-                    variable with the exception that the package being built has a build 
-                    dependency on the variable's list of packages.
-                    In other words, the image will not build if a file in this list is not found.
-                </para>
-                <para>
-                    For example, suppose you are building a runtime package that depends
-                    on a certain disk driver.
-                    In this case, you would use the following:
-                    <literallayout class='monospaced'>
-     MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "&lt;disk_driver&gt;"
-                    </literallayout>
-                </para>
+                <para>Specifies the list of packages required to boot the device.</para>
             </glossdef>
          </glossentry>
 
-         <glossentry id='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'><glossterm>MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS</glossterm>
+         <glossentry id='var-MACHINE_ESSENTIAL_RRECOMMENDS'><glossterm>MACHINE_ESSENTIAL_RRECOMMENDS</glossterm>
             <glossdef>
-                <para></para>
-                <para>
-                    A list of recommended packages to install as part of the package being 
-                    built. 
-                    The build process does not depend on these packages being present.
-                    Furthermore, because this is a "machine essential" variable, the list of 
-                    packages are essential for the machine to boot.
-                    The impact of this variable affects images based on <filename>task-core-boot</filename>,
-                    including the <filename>core-image-minimal</filename> image.
-                </para>
-                <para>
-                    This variable is similar to the 
-                    <filename><link linkend='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'>MACHINE_ESSENTIAL_EXTRA_RDEPENDS</link></filename>
-                    variable with the exception that the package being built does not have a build 
-                    dependency on the variable's list of packages.
-                    In other words, the image will build if a file in this list is not found.
-                    However, because this is one of the "essential" variables, the resulting image
-                    might not boot on the machine. 
-                    Or, if the machine does boot using the image, the machine might not be fully 
-                    functional.
-                </para>
-                <para>
-                    Consider an example where you have a custom kernel with a disk driver
-                    built into the kernel itself, rather than using the driver built as a module.
-                    If you include the package that has the driver module as part of 
-                    the variable's list, the 
-                    build process will not find that package.  
-                    However, because these packages are "recommends" packages, the build will 
-                    not fail due to the missing package.
-                    Not accounting for any other problems, the custom kernel would still boot the machine.
-                </para>
-                <para>
-                    Some example packages of these machine essentials are flash, screen, keyboard, mouse, 
-                    or touchscreen drivers (depending on the machine).
-                </para>
-                <para>
-                    For example, suppose you are building a runtime package that depends
-                    on a mouse driver.
-                    In this case, you would use the following:
-                    <literallayout class='monospaced'>
-     MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "&lt;mouse_driver&gt;"
-                    </literallayout>
-                </para>
+                <para>Specifies the list of packages required to boot the device (usually
+                    additional kernel modules).</para>
             </glossdef>
         </glossentry>
 
          <glossentry id='var-MACHINE_EXTRA_RDEPENDS'><glossterm>MACHINE_EXTRA_RDEPENDS</glossterm>
             <glossdef>
-                <para>
-                    A list of optional but non-machine essential packages to install as 
-                    part of the package being built.
-                    Even though these packages are not essential for the machine to boot,  
-                    the build process depends on them being present.
-                    The impact of this variable affects all images based on
-                    <filename>task-base</filename>, which does not include the 
-                    <filename>core-image-minimal</filename> or <filename>core-image-basic</filename> 
-                    images.
-                </para>
-                <para>
-                    This variable is similar to the 
-                    <filename><link linkend='var-MACHINE_EXTRA_RRECOMMENDS'>MACHINE_EXTRA_RRECOMMENDS</link></filename>
-                    variable with the exception that the package being built has a build 
-                    dependency on the variable's list of packages.
-                    In other words, the image will not build if a file in this list is not found.
-                </para>
-                <para>
-                    An example is a machine that might or might not have a WiFi card.
-                    The package containing the WiFi support is not essential for the 
-                    machine to boot the image.
-                    If it is not there, the machine will boot but not be able to use the 
-                    WiFi functionality.
-                    However, if you include the package with the WiFi support as part of the 
-                    variable's package list, the build 
-                    process depends on finding the package.
-                    In this case, you would use the following:
-                    <literallayout class='monospaced'>
-     MACHINE_EXTRA_RDEPENDS += "&lt;wifi_driver&gt;"
-                    </literallayout>
-                </para>
+                <para>Specifies the list of packages required to use the devices</para>
             </glossdef>
          </glossentry>
 
          <glossentry id='var-MACHINE_EXTRA_RRECOMMENDS'><glossterm>MACHINE_EXTRA_RRECOMMENDS</glossterm>
             <glossdef>
-                <para></para>
-                <para>
-                    A list of optional but non-machine essential packages to install as 
-                    part of the package being built.
-                    The package being built has no build dependency on the list of packages 
-                    with this variable.  
-                    The impact of this variable affects only images based on 
-                    <filename>task-base</filename>, which does not include the 
-                    <filename>core-image-minimal</filename> or <filename>core-image-basic</filename> 
-                    images.
-                </para>
-                <para>
-                    This variable is similar to the 
-                    <filename><link linkend='var-MACHINE_EXTRA_RDEPENDS'>MACHINE_EXTRA_RDEPENDS</link></filename>
-                    variable with the exception that the package being built does not have a build 
-                    dependency on the variable's list of packages.
-                    In other words, the image will build if a file in this list is not found.
-                </para>
-                <para>
-                    An example is a machine that might or might not have a WiFi card.
-                    The package containing the WiFi support is not essential for the 
-                    machine to boot the image.
-                    If it is not there, the machine will boot but not be able to use the 
-                    WiFi functionality.
-                    You are free to either include or not include the 
-                    the package with the WiFi support as part of the 
-                    variable's package list, the build 
-                    process does not depend on finding the package.
-                    If you include the package, you would use the following:
-                    <literallayout class='monospaced'>
-     MACHINE_EXTRA_RRECOMMENDS += "&lt;wifi_driver&gt;"
-                    </literallayout>
-                </para>
+                <para>Specifies the list of packages useful to use the device (e.g.
+                    additional kernel modules)</para>
             </glossdef>
          </glossentry>
 
          <glossentry id='var-MACHINE_FEATURES'><glossterm>MACHINE_FEATURES</glossterm>
             <glossdef>
                 <para>Specifies the list of device features.
-                    See the "<link linkend='ref-features-machine'>Machine</link>" section for 
+                    See the <link linkend='ref-features-machine'>Machine</link> section for 
                     more information.</para>
             </glossdef>
          </glossentry>
@@ -887,7 +689,7 @@
                     </literallayout>
                     For information on build performance effects as a result of the 
                     package manager use, see
-                    "<link linkend='ref-classes-package'>Packaging - <filename>package*.bbclass</filename></link>"
+                    <link linkend='ref-classes-package'>Packaging - <filename>package*.bbclass</filename></link>
                     in this manual.
                 </para>
             </glossdef>
@@ -933,7 +735,7 @@
                     This variable is usually in the form <filename>-j 4</filename>, where the number
                     represents the maximum number of parallel threads make can run.
                     If you development host supports multiple cores a good rule of thumb is to set 
-                    this variable to twice the number of cores on the host.</para>
+                    this variable to one and a half times the number of cores on the host.</para>
             </glossdef>
         </glossentry>
 
@@ -979,18 +781,10 @@
 
         <glossentry id='var-PREFERRED_PROVIDER'><glossterm>PREFERRED_PROVIDER</glossterm>
             <glossdef>
-                <para>
-                    If multiple recipes provide an item, this variable
+                <para>If multiple recipes provide an item, this variable
                     determines which recipe should be given preference. 
-                    The variable must always be suffixed with the name of the 
-                    provided item, and should be set to the 
-                    <filename>$PN</filename> of the recipe 
-                    to which you want to give precedence.
-                    Here is an example:
-                    <literallayout class='monospaced'>
-     PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86"
-                    </literallayout>
-                </para>
+                    The variable should be set to the <filename>$PN</filename> of the recipe 
+                    to which you want to give precedence.</para>
             </glossdef>
         </glossentry>
 
@@ -999,18 +793,8 @@
                 <para>
                     If there are multiple versions of recipes available, this
                     variable determines which recipe should be given preference.
-                    The variable must always be suffixed with the <filename>$PN</filename> 
-                    for which to select, and should be set to the 
-                    <filename>$PV</filename> to which you want to give precedence.
-                    You can use the "<filename>%</filename>" character as a wildcard
-                    to match any number of characters, which can be useful when 
-                    specifying versions that contain long revision number that could 
-                    potentially change.
-                    Here are two examples:
-                    <literallayout class='monospaced'>
-     PREFERRED_VERSION_python = "2.6.6"
-     PREFERRED_VERSION_linux-yocto = "3.0+git%" 
-                    </literallayout>
+                    The variable should be set to the <filename>$PV</filename> of the recipe 
+                    to whichy you want to give precedence.
                 </para>
             </glossdef>
         </glossentry>
@@ -1025,19 +809,19 @@
 
         <glossentry id='var-POKYLIBC'><glossterm>POKYLIBC</glossterm>
             <glossdef>
-                <para>
-                    This variable is no longer supported and has been replaced by the
-                    <link linkend='var-TCLIBC'><filename>TCLIBC</filename></link> variable.
-                </para>
+                <para>The <filename>libc</filename> implementation selector. 
+                    You can select <filename>glibc</filename>, <filename>eglibc</filename>, 
+                    or <filename>uclibc</filename>.</para>
             </glossdef>
         </glossentry>
 
         <glossentry id='var-POKYMODE'><glossterm>POKYMODE</glossterm>
             <glossdef>
-                <para>
-                    This variable is no longer supported and has been replaced by the
-                    <link linkend='var-TCMODE'><filename>TCMODE</filename></link> variable.
-                </para>
+                <para>The toolchain selector. 
+                    This variable has been replaced by <filename>TCMODE</filename>.
+                    The <filename>POKYMODE</filename> would select the external toolchain
+                    built from the Yocto Project or a few supported combinations of
+                    upstream GCC or CodeSourcery Labs toolchain.</para>
             </glossdef>
         </glossentry>
 
@@ -1059,48 +843,18 @@
         <glossentry id='var-RDEPENDS'><glossterm>RDEPENDS</glossterm>
             <glossdef>
                 <para>
-                    A list of packages that must be installed as part of a package being built.
-                    The package being built has a runtime dependency on the packages in the 
-                    variable's list.
-                    In other words, in order for the package being built to run correctly, 
-                    it depends on these listed packages.
-                    If a package in this list cannot be found during the build, the build
-                    will not complete.
-                </para>
-                <para>
-                    Because the <filename>RDEPENDS</filename> variable applies to packages 
-                    being built, you should 
-                    always attach an override to the variable to specify the particular runtime package
-                    that has the dependency.
-                    For example, suppose you are building a development package that depends
-                    on the <filename>perl</filename> package.
-                    In this case, you would use the following <filename>RDEPENDS</filename>
-                    statement:
-                    <literallayout class='monospaced'>
-     RDEPENDS_${PN}-dev += "perl"
-                    </literallayout>
-                    In the example, the package name (<filename>${PN}-dev</filename>) must 
-                    appear as it would in the 
+                    A list of run-time dependencies for a package. 
+                    These packages need to be installed alongside the package to which
+                    they apply. 
+                    This enables the package to run correctly. 
+                    For example, consider a Perl script, which depends on the Perl package. 
+                    Since this variable applies to 
+                    output packages, there would usually be an override attached 
+                    to this variable such as <filename>RDEPENDS_${PN}-dev</filename>. 
+                    Names in this field must appear as they appear in the
                     <filename><link linkend='var-PACKAGES'>PACKAGES</link></filename> namespace before any 
                     renaming of the output package by classes like <filename>debian.bbclass</filename>.
                 </para>
-                <para>
-                    Some automatic handling occurs around the <filename>RDEPENDS</filename>
-                    variable:
-                    <itemizedlist>
-                        <listitem><para><emphasis><filename>shlibdeps</filename></emphasis>:  If a runtime
-                            package contains a shared library (<filename>.so</filename>), the build
-                            processes the library in order to determine other libraries to which it 
-                            is dynamically linked.  
-                            The build process adds these libraries to <filename>RDEPENDS</filename>
-                            to create the runtime package.</para></listitem>
-                        <listitem><para><emphasis><filename>pcdeps</filename></emphasis>:  If the package
-                            ships a <filename>pkg-config</filename> information file, the build process
-                            uses this file to add items to the <filename>RDEPENDS</filename>
-                            variable to create the runtime packages.
-                            </para></listitem>
-                    </itemizedlist>
-                </para>
             </glossdef>
         </glossentry>
 
@@ -1112,37 +866,8 @@
 
         <glossentry id='var-RRECOMMENDS'><glossterm>RRECOMMENDS</glossterm>
             <glossdef>
-                <para>
-                    A list of packages that extend the usability of a package being 
-                    built.
-                    The package being built does not depend on this list of packages in 
-                    order to successfully build, but needs them for the extended usability.
-                    To specify runtime dependencies for packages, see the 
-                    <filename><link linkend='var-RDEPENDS'>RDEPENDS</link></filename> variable.
-                </para>
-                <para>
-                    The Yocto Project build process automatically installs the list of packages
-                    as part of the built package.
-                    However, you can remove them later if you want.
-                    If, during the build, a package from the list cannot be found, the build
-                    process continues without an error.
-                </para>
-                <para>
-                    Because the <filename>RRECOMMENDS</filename> variable applies to packages 
-                    being built, you should 
-                    always attach an override to the variable to specify the particular package
-                    whose usability is being extended.
-                    For example, suppose you are building a development package that is extended
-                    to support wireless functionality.
-                    In this case, you would use the following:
-                    <literallayout class='monospaced'>
-     RRECOMMENDS_${PN}-dev += "&lt;wireless_package_name&gt;"
-                    </literallayout>
-                    In the example, the package name (<filename>${PN}-dev</filename>) must 
-                    appear as it would in the 
-                    <filename><link linkend='var-PACKAGES'>PACKAGES</link></filename> namespace before any 
-                    renaming of the output package by classes like <filename>debian.bbclass</filename>.
-                </para>
+                <para>The list of packages that extend usability of the package. 
+                    The packages are automatically installed but can be removed by user.</para>
             </glossdef>
         </glossentry>
 
@@ -1161,7 +886,7 @@
                 <para>
                     The path to unpacked sources.
                     By default, this path is 
-                    "<filename>${<link linkend='var-WORKDIR'>WORKDIR</link>}/${<link linkend='var-PN'>PN</link>}-${<link linkend='var-PV'>PV</link>}</filename>".
+                    "${<link linkend='var-WORKDIR'>WORKDIR</link>}/${<link linkend='var-PN'>PN</link>}-${<link linkend='var-PV'>PV</link>}".
                 </para>
             </glossdef>
         </glossentry>
@@ -1236,14 +961,13 @@
 
         <glossentry id='var-SRC_URI_OVERRIDES_PACKAGE_ARCH'><glossterm>SRC_URI_OVERRIDES_PACKAGE_ARCH</glossterm>
             <glossdef>
-                <para></para>
                 <para>
                     By default, the Yocto Project automatically detects whether 
                     <filename><link linkend='var-SRC_URI'>SRC_URI</link></filename>  
                     contains files that are machine-specific.
                     If so, the Yocto Project automatically changes 
                     <filename><link linkend='var-PACKAGE_ARCH'>PACKAGE_ARCH</link></filename>. 
-                    Setting this variable to "0" disables this behavior.
+                    Setting this variable to "0" disables this behaviour.
                 </para>
             </glossdef>
         </glossentry>
@@ -1333,52 +1057,24 @@
         <glossentry id='var-TARGET_OS'><glossterm>TARGET_OS</glossterm>
             <glossdef>
                 <para>Specifies the target's operating system. 
-                    The variable can be set to "linux" for <filename>eglibc</filename>-based systems and
-                    to "linux-uclibc" for <filename>uclibc</filename>. 
+                    The variable can be set to "linux" for <filename>glibc</filename>-based systems and
+                    "linux-uclibc" for <filename>uClibc</filename>. 
                     For ARM/EABI targets, there are also "linux-gnueabi" and
                     "linux-uclibc-gnueabi" values possible.</para>
             </glossdef>
         </glossentry>
 
-        <glossentry id='var-TCLIBC'><glossterm>TCLIBC</glossterm>
-            <glossdef>
-                <para>
-                    Specifies which variant of the GNU standard C library (<filename>libc</filename>)
-                    to use during the build process.
-                    This variable replaces <filename>POKYLIBC</filename>, which is no longer
-                    supported.
-                </para>
-                <para>
-                    You can select <filename>eglibc</filename> or <filename>uclibc</filename>.
-                    <note>
-                        This release of the Yocto Project does not support the 
-                        <filename>glibc</filename> implementation of <filename>libc</filename>.
-                    </note>
-                </para>
-            </glossdef>
-        </glossentry>
-
         <glossentry id='var-TCMODE'><glossterm>TCMODE</glossterm>
             <glossdef>
-                <para>
-                    The toolchain selector. 
-                    This variable replaces <filename>POKYMODE</filename>, which is no longer
-                    supported.
-                </para>
-                <para>
-                    The <filename>TCMODE</filename> variable selects the external toolchain
-                    built from the Yocto Project or a few supported combinations of
-                    the upstream GCC or CodeSourcery Labs toolchain.
+                <para>The toolchain selector. 
+                    This variable replaces <filename>POKYMODE</filename>.
                     The variable determines which of the files in 
                     <filename>meta/conf/distro/include/tcmode-*</filename> is used. 
-                </para>
-                <para>
                     By default, <filename>TCMODE</filename> is set to "default", which 
-                    chooses <filename>tcmode-default.inc</filename>.
-                    The variable is similar to <filename>TCLIBC</filename>, which controls 
-                    the variant of the GNU standard C library (<filename>libc</filename>)
-                    used during the build process: <filename>eglibc</filename> or <filename>uclibc</filename>.
-                </para>
+                    chooses <filename>tcmode-default.inc</filename>.</para>
+                <para>The variable is similar to <filename>TCLIBC</filename>, which controls the 
+                    <filename>libc</filename> used: <filename>eglibc</filename> or <filename>uclibc</filename>.
+                    </para>
             </glossdef>
         </glossentry> 
 

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

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='ref-varlocality'>
     <title>Reference: Variable Context</title>
@@ -72,10 +71,10 @@
                         </link></filename></para></listitem>
                     <listitem><para><filename><link linkend='var-MACHINE_EXTRA_RRECOMMENDS'>MACHINE_EXTRA_RRECOMMENDS
                         </link></filename></para></listitem>
-                    <listitem><para><filename><link linkend='var-MACHINE_ESSENTIAL_EXTRA_RDEPENDS'>MACHINE_ESSENTIAL_EXTRA_RDEPENDS
+                    <listitem><para><filename><link linkend='var-MACHINE_ESSENTIAL_RDEPENDS'>MACHINE_ESSENTIAL_RDEPENDS
                         </link></filename></para></listitem>
-                    <listitem><para><filename><link linkend='var-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS'>
-                        MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS</link></filename></para></listitem>
+                    <listitem><para><filename><link linkend='var-MACHINE_ESSENTIAL_RRECOMMENDS'>
+                        MACHINE_ESSENTIAL_RRECOMMENDS</link></filename></para></listitem>
                 </itemizedlist>
             </para>
         </section>

documentation/poky-ref-manual/resources.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <appendix id='resources'>
 <title>Contributing to the Yocto Project</title>
@@ -11,8 +10,10 @@
         The Yocto Project team is happy for people to experiment with the Yocto Project.
         A number of places exist to find help if you run into difficulties or find bugs. 
         To find out how to download source code,
-        see the "<ulink url='&YOCTO_DOCS_DEV_URL;#local-yp-release'>Yocto Project Release</ulink>"
-        list item in the Yocto Project Development Manual.
+        see the <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#local-yp-release'>
+        Yocto Project Release</ulink> list item in
+        <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>The Yocto 
+        Project Development Manual</ulink>.
     </para>
 </section>
 
@@ -21,7 +22,7 @@
 
     <para>
         If you find problems with the Yocto Project, you should report them using the 
-        Bugzilla application at <ulink url='&YOCTO_BUGZILLA_URL;'></ulink>.
+        Bugzilla application at <ulink url='http://bugzilla.yoctoproject.org/'></ulink>.
     </para>
 </section>
 
@@ -31,16 +32,13 @@
     <para>
         To subscribe to the Yocto Project mailing lists, click on the following URLs and follow the instructions:
         <itemizedlist>
-            <listitem><para><emphasis>
-                <ulink url='&YOCTO_LISTS_URL;/listinfo/yocto-announce'></ulink></emphasis>:
-                Use this list to receive offical Yocto Project announcements for developments and 
-                to learn about Yocto Project milestones.</para></listitem>
-            <listitem><para><emphasis><ulink url='&YOCTO_LISTS_URL;/listinfo/yocto'></ulink></emphasis>:
-                Use this list to monitor Yocto Project development discussions, ask questions, and 
-                get help.</para></listitem>
-            <listitem><para><emphasis><ulink url='&YOCTO_LISTS_URL;/listinfo/poky'></ulink></emphasis>:
-                Use this list to monitor discussions about the Yocto Project build system Poky, 
-                ask questions, and get help.</para></listitem>
+            <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto'></ulink> for a 
+                Yocto Discussions mailing list.</para></listitem>
+            <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/poky'></ulink> for a 
+                Yocto Project Discussions mailing list.</para></listitem>
+            <listitem><para><ulink url='http://lists.yoctoproject.org/listinfo/yocto-announce'></ulink> for a 
+                mailing list to receive offical Yocto Project announcements for developments and 
+                as well as Yocto Project milestones.</para></listitem>
         </itemizedlist>
     </para>
 </section>
@@ -49,7 +47,7 @@
     <title>Internet Relay Chat (IRC)</title>
 
     <para>
-        Two IRC channels on freenode are available for the Yocto Project and Poky discussions:
+        Two IRC channels on freenode are available for Yocto Project and Poky discussions:
         <itemizedlist>
             <listitem><para><filename>#yocto</filename></para></listitem>
             <listitem><para><filename>#poky</filename></para></listitem>
@@ -63,19 +61,19 @@
     <para>
         Following is a list of resources you will find helpful:
         <itemizedlist>
-            <listitem><para><emphasis><ulink url='&YOCTO_HOME_URL;'>The Yocto Project website</ulink>:
+            <listitem><para><emphasis><ulink url='http://yoctoproject.org'>The Yocto Project website</ulink>:
                 </emphasis> The home site for the Yocto Project.</para></listitem>
-            <listitem><para><emphasis><ulink url='&OH_HOME_URL;'>OpenedHand</ulink>:</emphasis>
+            <listitem><para><emphasis><ulink url='http://www.openedhand.com/'>OpenedHand</ulink>:</emphasis>
                 The company where the Yocto Project build system Poky was first developed.
                 OpenedHand has since been acquired by Intel Corporation.</para></listitem>
             <listitem><para><emphasis><ulink url='http://www.intel.com/'>Intel Corporation</ulink>:</emphasis>
                 The company who acquired OpenedHand in 2008 and continues development on the 
                 Yocto Project.</para></listitem>
-            <listitem><para><emphasis><ulink url='&OE_HOME_URL;'>OpenEmbedded</ulink>:</emphasis>
+            <listitem><para><emphasis><ulink url='http://www.openembedded.org/'>OpenEmbedded</ulink>:</emphasis>
                 The upstream, generic, embedded distribution the Yocto Project build system (Poky) derives
                 from and to which it contributes.</para></listitem>
             <listitem><para><emphasis><ulink url='http://developer.berlios.de/projects/bitbake/'>
-                BitBake</ulink>:</emphasis> The tool used to process Yocto Project metadata.</para></listitem>
+                Bitbake</ulink>:</emphasis> The tool used to process Yocto Project metadata.</para></listitem>
             <listitem><para><emphasis><ulink url='http://bitbake.berlios.de/manual/'>
                 BitBake User Manual</ulink>:</emphasis> A comprehensive guide to the BitBake tool.
                 </para></listitem>
@@ -92,12 +90,44 @@
     <title>Contributions</title>
 
     <para>
-        The Yocto Project gladly accepts contributions.
-        You can submit changes to the project either by creating and sending pull requests, 
-        or by submitting patches through email.
-        For information on how to do both, see the
-        "<ulink url='&YOCTO_DOCS_DEV_URL;#how-to-submit-a-change'>How to Submit a Change</ulink>"
-        section in the Yocto Project Development Manual.
+        Contributions to the Yocto Project are very welcome. 
+        You should send patches to the Yocto Project mailing list along with a "signed-off-by:"
+        line in the same style as required by the Linux kernel. 
+        Adding this line signifies the developer has agreed to the Developer's Certificate of Origin 1.1
+        as follows:
+        <literallayout class='monospaced'>
+     Developer's Certificate of Origin 1.1
+
+     By making a contribution to this project, I certify that:
+
+     (a) The contribution was created in whole or in part by me and I
+         have the right to submit it under the open source license
+         indicated in the file; or
+
+     (b) The contribution is based upon previous work that, to the best
+         of my knowledge, is covered under an appropriate open source
+         license and I have the right under that license to submit that
+         work with modifications, whether created in whole or in part
+         by me, under the same open source license (unless I am
+         permitted to submit under a different license), as indicated
+         in the file; or
+
+     (c) The contribution was provided directly to me by some other
+         person who certified (a), (b) or (c) and I have not modified
+         it.
+
+     (d) I understand and agree that this project and the contribution
+         are public and that a record of the contribution (including all
+         personal information I submit with it, including my sign-off) is
+         maintained indefinitely and may be redistributed consistent with
+         this project or the open source license(s) involved.
+        </literallayout>
+        A Poky contributions tree (<filename>poky-contrib</filename>, 
+        <filename>git://git.yoctoproject.org/poky-contrib.git</filename>)
+        exists for contributors to stage contributions.
+        If people desire such access, please ask on the mailing list. 
+        Usually, the Yocto Project team will grant access to anyone with a proven track 
+        record of good patches.
     </para>
 </section>
 

documentation/poky-ref-manual/style.css

@@ -654,7 +654,7 @@ hr {
 
 
 .tip, .warning, .caution, .note {
-  border-color: #fff;
+  border-color: #aaa;
 }
 
 
@@ -662,24 +662,24 @@ hr {
 .warning table th,
 .caution table th,
 .note table th {
-  border-bottom-color: #fff;
+  border-bottom-color: #aaa;
 }
 
 
 .warning {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .caution {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .tip {
-  background-color: #f0f0f2;
+  background-color: #eff;
 }
 
 .note {
-  background-color: #f0f0f2; 
+  background-color: #dfc;
 }
 
 .glossary dl dt, 
@@ -946,8 +946,8 @@ table {
 
 .tip,
 .note {
-   background: #f0f0f2; 
-   color: #333;   
+   background: #666666;
+   color: #fff;   
    padding: 20px;
    margin: 20px;
 }
@@ -958,26 +958,11 @@ table {
    margin: 0em;
    font-size: 2em;
    font-weight: bold;
-   color: #333;   
+   color: #fff;   
 }
 
 .tip a,
 .note a {
-   color: #333;   
+   color: #fff;   
    text-decoration: underline;
 }
-
-.footnote {
-   font-size: small;
-   color: #333;
-}
-
-/* Changes the announcement text */
-.tip h3,
-.warning h3,
-.caution h3,
-.note h3 {
-   font-size:large;
-   color: #00557D;
-}
-

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

@@ -1,569 +0,0 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
-
-<chapter id='technical-details'>
-<title>Technical Details</title>
-
-    <para>
-        This chapter provides technical details for various parts of the Yocto Project. 
-        Currently, topics include Yocto Project components and shared state (sstate) cache.
-    </para>
-
-<section id='usingpoky-components'>
-    <title>Yocto Project Components</title>
-
-    <para>
-        The BitBake task executor together with various types of configuration files form the 
-        Yocto Project core.
-        This section overviews the BitBake task executor and the
-        configuration files by describing what they are used for and how they interact.
-    </para>
-    
-    <para>  
-        BitBake handles the parsing and execution of the data files. 
-        The data itself is of various types:
-    <itemizedlist>
-        <listitem><para><emphasis>Recipes:</emphasis>  Provides details about particular 
-            pieces of software</para></listitem>
-        <listitem><para><emphasis>Class Data:</emphasis>  An abstraction of common build 
-            information (e.g. how to build a Linux kernel).</para></listitem>
-        <listitem><para><emphasis>Configuration Data:</emphasis>  Defines machine-specific settings, 
-            policy decisions, etc.
-            Configuration data acts as the glue to bind everything together.</para></listitem>
-    </itemizedlist>
-        For more information on data, see the
-        "<ulink url='&YOCTO_DOCS_DEV_URL;#yocto-project-terms'>Yocto Project Terms</ulink>"
-        section in the Yocto Project Development Manual.
-    </para>
-
-    <para> 
-        BitBake knows how to combine multiple data sources together and refers to each data source
-        as a "<link linkend='usingpoky-changes-layers'>layer</link>".
-    </para>
-
-    <para>
-        Following are some brief details on these core components.
-        For more detailed information on these components see the 
-        "<link linkend='ref-structure'>Reference: Directory Structure</link>" appendix.
-    </para>
-
-    <section id='usingpoky-components-bitbake'>
-        <title>BitBake</title>
-
-        <para>
-            BitBake is the tool at the heart of the Yocto Project and is responsible
-            for parsing the metadata, generating a list of tasks from it,
-            and then executing those tasks. 
-            To see a list of the options BitBake supports, use the following help command:
-            <literallayout class='monospaced'>
-     $ bitbake --help
-            </literallayout>
-        </para>
-
-        <para>
-            The most common usage for BitBake is <filename>bitbake &lt;packagename&gt;</filename>, where
-            <filename>packagename</filename> is the name of the package you want to build 
-            (referred to as the "target" in this manual). 
-            The target often equates to the first part of a <filename>.bb</filename> filename.
-            So, to run the <filename>matchbox-desktop_1.2.3.bb</filename> file, you
-            might type the following:
-            <literallayout class='monospaced'>
-     $ bitbake matchbox-desktop
-            </literallayout>
-            Several different versions of <filename>matchbox-desktop</filename> might exist.
-            BitBake chooses the one selected by the distribution configuration.
-            You can get more details about how BitBake chooses between different 
-            target versions and providers in the 
-            "<link linkend='ref-bitbake-providers'>Preferences and Providers</link>" section.
-        </para>
-
-        <para>
-            BitBake also tries to execute any dependent tasks first.
-            So for example, before building <filename>matchbox-desktop</filename>, BitBake
-            would build a cross compiler and <filename>eglibc</filename> if they had not already 
-            been built.
-            <note>This release of the Yocto Project does not support the <filename>glibc</filename>
-                GNU version of the Unix standard C library.  By default, the Yocto Project builds with
-                <filename>eglibc</filename>.</note>
-        </para>
-
-        <para>
-            A useful BitBake option to consider is the <filename>-k</filename> or 
-            <filename>--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>
-
-    <section id='usingpoky-components-metadata'>
-        <title>Metadata (Recipes)</title>
-
-        <para>
-            The <filename>.bb</filename> files are usually referred to as "recipes." 
-            In general, a recipe contains information about a single piece of software.
-            The information includes the location from which to download the source patches 
-            (if any are needed), which special configuration options to apply, 
-            how to compile the source files, and how to package the compiled output. 
-        </para>
-
-        <para>
-            The term "package" can also be used to describe recipes.
-            However, since the same word is used for the packaged output from the Yocto 
-            Project (i.e. <filename>.ipk</filename> or <filename>.deb</filename> files), 
-            this document avoids using the term "package" when referring to recipes.
-        </para>
-    </section>
-
-    <section id='usingpoky-components-classes'>
-        <title>Classes</title>
-
-        <para>
-            Class files (<filename>.bbclass</filename>) contain information that is useful to share
-            between metadata files. 
-            An example is the Autotools class, which contains
-            common settings for any application that Autotools uses.
-            The "<link linkend='ref-classes'>Reference: Classes</link>" appendix provides details
-            about common classes and how to use them.
-        </para>
-    </section>
-
-    <section id='usingpoky-components-configuration'>
-        <title>Configuration</title>
-
-        <para>
-            The configuration files (<filename>.conf</filename>) define various configuration variables
-            that govern the Yocto Project build process. 
-            These files fall into several areas that define machine configuration options, 
-            distribution configuration options, compiler tuning options, general common configuration
-            options and user configuration options (<filename>local.conf</filename>, which is found
-            in the Yocto Project files build directory).
-        </para>
-    </section>
-</section>
-
-<section id="shared-state-cache">
-    <title>Shared State Cache</title>
-
-    <para>
-        By design, the Yocto Project build system builds everything from scratch unless 
-        BitBake can determine that parts don't need to be rebuilt.
-        Fundamentally, building from scratch is attractive as it means all parts are 
-        built fresh and there is no possibility of stale data causing problems. 
-        When developers hit problems, they typically default back to building from scratch
-        so they know the state of things from the start.
-    </para>
-
-    <para>  
-        Building an image from scratch is both an advantage and a disadvantage to the process. 
-        As mentioned in the previous paragraph, building from scratch ensures that 
-        everything is current and starts from a known state.
-        However, building from scratch also takes much longer as it generally means 
-        rebuilding things that don't necessarily need rebuilt.
-    </para>
-
-    <para>
-        The Yocto Project implements shared state code that supports incremental builds.
-        The implementation of the shared state code answers the following questions that
-        were fundamental roadblocks within the Yocto Project incremental build support system:
-        <itemizedlist>
-            <listitem>What pieces of the system have changed and what pieces have not changed?</listitem>
-            <listitem>How are changed pieces of software removed and replaced?</listitem>
-            <listitem>How are pre-built components that don't need to be rebuilt from scratch
-                used when they are available?</listitem>
-        </itemizedlist>
-    </para>
-
-    <para>
-        For the first question, the build system detects changes in the "inputs" to a given task by 
-        creating a checksum (or signature) of the task's inputs. 
-        If the checksum changes, the system assumes the inputs have changed and the task needs to be 
-        rerun.
-        For the second question, the shared state (sstate) code tracks which tasks add which output
-        to the build process. 
-        This means the output from a given task can be removed, upgraded or otherwise manipulated.
-        The third question is partly addressed by the solution for the second question
-        assuming the build system can fetch the sstate objects from remote locations and 
-        install them if they are deemed to be valid.
-    </para>
-
-    <para>
-        The rest of this section goes into detail about the overall incremental build
-        architecture, the checksums (signatures), shared state, and some tips and tricks.
-    </para>
-
-    <section id='overall-architecture'>
-        <title>Overall Architecture</title>
-
-        <para>
-            When determining what parts of the system need to be built, BitBake 
-            uses a per-task basis and does not use a per-recipe basis.
-            You might wonder why using a per-task basis is preferred over a per-recipe basis.
-            To help explain, consider having the IPK packaging backend enabled and then switching to DEB. 
-            In this case, <filename>do_install</filename> and <filename>do_package</filename>
-            output are still valid.
-            However, with a per-recipe approach, the build would not include the 
-            <filename>.deb</filename> files.        
-            Consequently, you would have to invalidate the whole build and rerun it. 
-            Rerunning everything is not the best situation.
-            Also in this case, the core must be "taught" much about specific tasks. 
-            This methodology does not scale well and does not allow users to easily add new tasks 
-            in layers or as external recipes without touching the packaged-staging core.
-        </para>
-    </section>
-
-    <section id='checksums'>
-        <title>Checksums (Signatures)</title>
-
-        <para>
-            The shared state code uses a checksum, which is a unique signature of a task's 
-            inputs, to determine if a task needs to be run again. 
-            Because it is a change in a task's inputs that triggers a rerun, the process
-            needs to detect all the inputs to a given task. 
-            For shell tasks, this turns out to be fairly easy because
-            the build process generates a "run" shell script for each task and 
-            it is possible to create a checksum that gives you a good idea of when 
-            the task's data changes.
-        </para>
-
-        <para>
-            To complicate the problem, there are things that should not be included in 
-            the checksum. 
-            First, there is the actual specific build path of a given task - 
-            the <filename>WORKDIR</filename>. 
-            It does not matter if the working directory changes because it should not 
-            affect the output for target packages.
-            Also, the build process has the objective of making native/cross packages relocatable. 
-            The checksum therefore needs to exclude <filename>WORKDIR</filename>.
-            The simplistic approach for excluding the working directory is to set 
-            <filename>WORKDIR</filename> to some fixed value and create the checksum
-            for the "run" script. 
-        </para>
-
-        <para>
-            Another problem results from the "run" scripts containing functions that 
-            might or might not get called.  
-            The incremental build solution contains code that figures out dependencies 
-            between shell functions.
-            This code is used to prune the "run" scripts down to the minimum set, 
-            thereby alleviating this problem and making the "run" scripts much more 
-            readable as a bonus.
-        </para>
-
-        <para>
-            So far we have solutions for shell scripts.
-            What about python tasks?
-            The same approach applies even though these tasks are more difficult.
-            The process needs to figure out what variables a python function accesses 
-            and what functions it calls.
-            Again, the incremental build solution contains code that first figures out 
-            the variable and function dependencies, and then creates a checksum for the data 
-            used as the input to the task.
-        </para>
-
-        <para>
-            Like the <filename>WORKDIR</filename> case, situations exist where dependencies 
-            should be ignored.
-            For these cases, you can instruct the build process to ignore a dependency
-            by using a line like the following:
-            <literallayout class='monospaced'>
-     PACKAGE_ARCHS[vardepsexclude] = "MACHINE"
-            </literallayout>
-            This example ensures that the <filename>PACKAGE_ARCHS</filename> variable does not 
-            depend on the value of <filename>MACHINE</filename>, even if it does reference it.
-        </para>
-           
-        <para>
-            Equally, there are cases where we need to add dependencies BitBake is not able to find.
-            You can accomplish this by using a line like the following:
-            <literallayout class='monospaced'>
-      PACKAGE_ARCHS[vardeps] = "MACHINE"
-            </literallayout>
-            This example explicitly adds the <filename>MACHINE</filename> variable as a 
-            dependency for <filename>PACKAGE_ARCHS</filename>.
-        </para>
-
-        <para> 
-            Consider a case with inline python, for example, where BitBake is not
-            able to figure out dependencies. 
-            When running in debug mode (i.e. using <filename>-DDD</filename>), BitBake 
-            produces output when it discovers something for which it cannot figure out
-            dependencies. 
-            The Yocto Project team has currently not managed to cover those dependencies 
-            in detail and is aware of the need to fix this situation.
-        </para>
-
-        <para>
-            Thus far, this section has limited discussion to the direct inputs into a task.
-            Information based on direct inputs is referred to as the "basehash" in the
-            code. 
-            However, there is still the question of a task's indirect inputs - the
-            things that were already built and present in the build directory. 
-            The checksum (or signature) for a particular task needs to add the hashes 
-            of all the tasks on which the particular task depends. 
-            Choosing which dependencies to add is a policy decision. 
-            However, the effect is to generate a master checksum that combines the basehash 
-            and the hashes of the task's dependencies.
-        </para>
-
-        <para>
-            At the code level, there are a variety of ways both the basehash and the
-            dependent task hashes can be influenced. 
-            Within the BitBake configuration file, we can give BitBake some extra information 
-            to help it construct the basehash.
-            The following statements effectively result in a list of global variable
-            dependency excludes - variables never included in any checksum:
-            <literallayout class='monospaced'>
-  BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH"
-  BB_HASHBASE_WHITELIST += "DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS"
-  BB_HASHBASE_WHITELIST += "FILE_DIRNAME HOME LOGNAME SHELL TERM USER"
-  BB_HASHBASE_WHITELIST += "FILESPATH USERNAME STAGING_DIR_HOST STAGING_DIR_TARGET"
-            </literallayout>
-            The previous example actually excludes 
-            <link linkend='var-WORKDIR'><filename>WORKDIR</filename></link>
-            since it is actually constructed as a path within 
-            <filename>TMPDIR</filename>, which is on 
-            the whitelist. 
-        </para>
-
-        <para>
-            The rules for deciding which hashes of dependent tasks to include through
-            dependency chains are more complex and are generally accomplished with a 
-            python function. 
-            The code in <filename>meta/lib/oe/sstatesig.py</filename> shows two examples
-            of this and also illustrates how you can insert your own policy into the system 
-            if so desired.
-            This file defines the two basic signature generators <filename>OE-Core</filename>
-            uses:  "OEBasic" and "OEBasicHash". 
-            By default, there is a dummy "noop" signature handler enabled in BitBake. 
-            This means that behavior is unchanged from previous versions. 
-            <filename>OE-Core</filename> uses the "OEBasic" signature handler by default
-            through this setting in the <filename>bitbake.conf</filename> file:
-            <literallayout class='monospaced'>
-  BB_SIGNATURE_HANDLER ?= "OEBasic"
-            </literallayout>
-            The "OEBasicHash" <filename>BB_SIGNATURE_HANDLER</filename> is the same as the 
-            "OEBasic" version but adds the task hash to the stamp files. 
-            This results in any metadata change that changes the task hash, automatically 
-            causing the task to be run again. 
-            This removes the need to bump <link linkend='var-PR'><filename>PR</filename></link>
-            values and changes to metadata automatically ripple across the build. 
-            Currently, this behavior is not the default behavior for <filename>OE-Core</filename>
-            but is the default in <filename>poky</filename>.
-        </para>
-
-        <para>
-            It is also worth noting that the end result of these signature generators is to
-            make some dependency and hash information available to the build. 
-            This information includes:
-            <literallayout class='monospaced'>
-  BB_BASEHASH_task-&lt;taskname&gt; - the base hashes for each task in the recipe
-  BB_BASEHASH_&lt;filename:taskname&gt; - the base hashes for each dependent task
-  BBHASHDEPS_&lt;filename:taskname&gt; - The task dependencies for each task
-  BB_TASKHASH - the hash of the currently running task
-            </literallayout>
-        </para>
-    </section>
-
-    <section id='shared-state'>
-        <title>Shared State</title>
-
-        <para>
-            Checksums and dependencies, as discussed in the previous section, solve half the 
-            problem.
-            The other part of the problem is being able to use checksum information during the build
-            and being able to reuse or rebuild specific components.
-        </para>
-
-        <para>
-            The shared state class (<filename>sstate.bbclass</filename>) 
-            is a relatively generic implementation of how to "capture" a snapshot of a given task. 
-            The idea is that the build process does not care about the source of a task's output.
-            Output could be freshly built or it could be downloaded and unpacked from
-            somewhere - the build process doesn't need to worry about its source.
-        </para>
-
-        <para>
-            There are two types of output, one is just about creating a directory
-            in <filename>WORKDIR</filename>.
-            A good example is the output of either <filename>do_install</filename> or 
-            <filename>do_package</filename>. 
-            The other type of output occurs when a set of data is merged into a shared directory 
-            tree such as the sysroot.
-        </para>
-
-        <para>
-            The Yocto Project team has tried to keep the details of the implementation hidden in 
-            <filename>sstate.bbclass</filename>. 
-            From a user's perspective, adding shared state wrapping to a task
-            is as simple as this <filename>do_deploy</filename> example taken from 
-            <filename>do_deploy.bbclass</filename>:
-            <literallayout class='monospaced'>
-     DEPLOYDIR = "${WORKDIR}/deploy-${PN}"
-     SSTATETASKS += "do_deploy"
-     do_deploy[sstate-name] = "deploy"
-     do_deploy[sstate-inputdirs] = "${DEPLOYDIR}"
-     do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}"
-
-     python do_deploy_setscene () {
-         sstate_setscene(d)
-     }
-     addtask do_deploy_setscene
-            </literallayout>
-            In the example, we add some extra flags to the task, a name field ("deploy"), an
-            input directory where the task sends data, and the output
-            directory where the data from the task should eventually be copied. 
-            We also add a <filename>_setscene</filename> variant of the task and add the task
-            name to the <filename>SSTATETASKS</filename> list.
-        </para>
-
-        <para>
-            If you have a directory whose contents you need to preserve, you can do this with 
-            a line like the following:
-            <literallayout class='monospaced'>
-     do_package[sstate-plaindirs] = "${PKGD} ${PKGDEST}"
-            </literallayout>
-            This method, as well as the following example, also works for multiple directories.
-            <literallayout class='monospaced'>
-     do_package[sstate-inputdirs] = "${PKGDESTWORK} ${SHLIBSWORKDIR}"
-     do_package[sstate-outputdirs] = "${PKGDATA_DIR} ${SHLIBSDIR}"
-     do_package[sstate-lockfile] = "${PACKAGELOCK}"
-            </literallayout>
-            These methods also include the ability to take a lockfile when manipulating
-            shared state directory structures since some cases are sensitive to file
-            additions or removals.
-        </para>
-
-        <para>
-            Behind the scenes, the shared state code works by looking in 
-            <filename>SSTATE_DIR</filename> and  
-            <filename>SSTATE_MIRRORS</filename> for shared state files. 
-            Here is an example:
-            <literallayout class='monospaced'>
-     SSTATE_MIRRORS ?= "\
-     file://.* http://someserver.tld/share/sstate/ \n \
-     file://.* file:///some/local/dir/sstate/"
-            </literallayout>
-        </para>
-
-        <para>
-            The shared state package validity can be detected just by looking at the
-            filename since the filename contains the task checksum (or signature) as
-            described earlier in this section. 
-            If a valid shared state package is found, the build process downloads it 
-            and uses it to accelerate the task.
-        </para>
-
-        <para>
-            The build processes uses the <filename>*_setscene</filename> tasks
-            for the task acceleration phase.
-            BitBake goes through this phase before the main execution code and tries
-            to accelerate any tasks for which it can find shared state packages. 
-            If a shared state package for a task is available, the shared state
-            package is used.
-            This means the task and any tasks on which it is dependent are not 
-            executed.
-        </para>
-
-        <para>
-            As a real world example, the aim is when building an IPK-based image,
-            only the <filename>do_package_write_ipk</filename> tasks would have their 
-            shared state packages fetched and extracted. 
-            Since the sysroot is not used, it would never get extracted. 
-            This is another reason why a task-based approach is preferred over a 
-            recipe-based approach, which would have to install the output from every task.
-        </para>
-    </section>
-
-    <section id='tips-and-tricks'>
-        <title>Tips and Tricks</title>
-
-        <para>
-            The code in the Yocto Project that supports incremental builds is not 
-            simple code.
-            This section presents some tips and tricks that help you work around 
-            issues related to shared state code.
-        </para>
-
-        <section id='debugging'>
-            <title>Debugging</title>
-
-            <para>
-                When things go wrong, debugging needs to be straightforward. 
-                Because of this, the Yocto Project team included strong debugging
-                tools:
-                <itemizedlist>
-                    <listitem><para>Whenever a shared state package is written out, so is a
-                        corresponding <filename>.siginfo</filename> file. 
-                        This practice results in a pickled python database of all
-                        the metadata that went into creating the hash for a given shared state
-                        package.</para></listitem>
-                    <listitem><para>If BitBake is run with the <filename>--dump-signatures</filename>
-                        (or <filename>-S</filename>) option, BitBake dumps out 
-                        <filename>.siginfo</filename> files in
-                        the stamp directory for every task it would have executed instead of
-                        building the specified target package.</para></listitem>
-                    <listitem><para>There is a <filename>bitbake-diffsigs</filename> command that
-                        can process these <filename>.siginfo</filename> files. 
-                        If one file is specified, it will dump out the dependency
-                        information in the file. 
-                        If two files are specified, it will compare the two files and dump out 
-                        the differences between the two.
-                        This allows the question of "What changed between X and Y?" to be
-                        answered easily.</para></listitem>
-                </itemizedlist>
-            </para>
-        </section>
-
-        <section id='invalidating-shared-state'>
-            <title>Invalidating Shared State</title>
-
-            <para>
-                The shared state code uses checksums and shared state memory 
-                cache to avoid unnecessarily rebuilding tasks.
-                As with all schemes, this one has some drawbacks.
-                It is possible that you could make implicit changes that are not factored 
-                into the checksum calculation, but do affect a task's output. 
-                A good example is perhaps when a tool changes its output.
-                Let's say that the output of <filename>rpmdeps</filename> needed to change.
-                The result of the change should be that all the "package", "package_write_rpm",
-                and "package_deploy-rpm" shared state cache items would become invalid.
-                But, because this is a change that is external to the code and therefore implicit,
-                the associated shared state cache items do not become invalidated.
-                In this case, the build process would use the cached items rather than running the 
-                task again. 
-                Obviously, these types of implicit changes can cause problems.
-            </para>
-
-            <para>
-                To avoid these problems during the build, you need to understand the effects of any
-                change you make.
-                Note that any changes you make directly to a function automatically are factored into 
-                the checksum calculation and thus, will invalidate the associated area of sstate cache.
-                You need to be aware of any implicit changes that are not obvious changes to the 
-                code and could affect the output of a given task. 
-                Once you are aware of such a change, you can take steps to invalidate the cache 
-                and force the task to run. 
-                The step to take is as simple as changing a function's comments in the source code. 
-                For example, to invalidate package shared state files, change the comment statements
-                of <filename>do_package</filename> or the comments of one of the functions it calls.
-                The change is purely cosmetic, but it causes the checksum to be recalculated and  
-                forces the task to be run again.
-            </para>
-
-            <note>
-                For an example of a commit that makes a cosmetic change to invalidate 
-                a shared state, see this
-                <ulink url='&YOCTO_GIT_URL;/cgit.cgi/poky/commit/meta/classes/package.bbclass?id=737f8bbb4f27b4837047cb9b4fbfe01dfde36d54'>commit</ulink>.
-            </note>
-        </section>                
-    </section>
-</section>
-
-</chapter>
-<!-- 
-vim: expandtab tw=80 ts=4 
--->

documentation/poky-ref-manual/usingpoky.xml

@@ -1,87 +1,213 @@
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
-
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id='usingpoky'>
 <title>Using the Yocto Project</title>
 
     <para>
-        This chapter describes common usage for the Yocto Project.
-        The information is introductory in nature as other manuals in the Yocto Project
-        provide more details on how to use the Yocto Project.
+        This section gives an overview of the components that make up the Yocto Project 
+        followed by information about Yocto Project builds and dealing with any
+        problems that might arise.
     </para>
 
+<section id='usingpoky-components'>
+    <title>Yocto Project Components</title>
+
+    <para>
+        The BitBake task executor together with various types of configuration files form the 
+        Yocto Project core.
+        This section overviews the BitBake task executor and the
+        configuration files by describing what they are used for and they they interact.
+    </para>
+    
+    <para>  
+        BitBake handles the parsing and execution of the data files. 
+        The data itself is of various types:
+    <itemizedlist>
+        <listitem><para><emphasis>Recipes:</emphasis>  Provides details about particular 
+            pieces of software</para></listitem>
+        <listitem><para><emphasis>Class Data:</emphasis>  An abstraction of common build 
+            information (e.g. how to build a Linux kernel).</para></listitem>
+        <listitem><para><emphasis>Configuration Data:</emphasis>  Defines machine-specific settings, 
+            policy decisions, etc.
+            Configuration data acts a the glue to bind everything together.</para></listitem>
+    </itemizedlist>
+        For more information on data, see the
+        <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html#yocto-project-terms'>
+        Yocto Project Terms</ulink> section in 
+        <ulink url='http://www.yoctoproject.org/docs/1.1/dev-manual/dev-manual.html'>
+        The Yocto Project Development Manual</ulink>.
+    </para>
+
+    <para> 
+        BitBake knows how to combine multiple data sources together and refers to each data source
+        as a <link linkend='usingpoky-changes-layers'>'layer'</link>.
+    </para>
+
+    <para>
+        Following are some brief details on these core components.
+        For more detailed information on these components see the 
+        <link linkend='ref-structure'>'Reference: Directory Structure'</link>
+        appendix.
+    </para>
+
+    <section id='usingpoky-components-bitbake'>
+        <title>BitBake</title>
+
+        <para>
+            BitBake is the tool at the heart of the Yocto Project and is responsible
+            for parsing the metadata, generating a list of tasks from it,
+            and then executing those tasks. 
+            To see a list of the options BitBake supports, use the following help command:
+            <literallayout class='monospaced'>
+     $ bitbake --help
+            </literallayout>
+        </para>
+
+        <para>
+            The most common usage for BitBake is <filename>bitbake &lt;packagename&gt;</filename>, where
+            <filename>packagename</filename> is the name of the package you want to build 
+            (referred to as the "target" in this manual). 
+            The target often equates to the first part of a <filename>.bb</filename> filename.
+            So, to run the <filename>matchbox-desktop_1.2.3.bb</filename> file, you
+            might type the following:
+            <literallayout class='monospaced'>
+     $ bitbake matchbox-desktop
+            </literallayout>
+            Several different versions of <filename>matchbox-desktop</filename> might exist.
+            BitBake chooses the one selected by the distribution configuration.
+            You can get more details about how BitBake chooses between different 
+            target versions and providers in the 
+            <link linkend='ref-bitbake-providers'>Preferences and Providers</link> section.
+        </para>
+
+        <para>
+            BitBake also tries to execute any dependent tasks first.
+            So for example, before building <filename>matchbox-desktop</filename>, BitBake
+            would build a cross compiler and <filename>glibc</filename> if they had not already 
+            been built.
+        </para>
+
+        <para>
+            A useful BitBake option to consider is the <filename>-k</filename> or 
+            <filename>--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>
+
+    <section id='usingpoky-components-metadata'>
+        <title>Metadata (Recipes)</title>
+
+        <para>
+            The <filename>.bb</filename> files are usually referred to as "recipes." 
+            In general, a recipe contains information about a single piece of software.
+            The information includes the location from which to download the source patches 
+            (if any are needed), which special configuration options to apply, 
+            how to compile the source files, and how to package the compiled output. 
+        </para>
+
+        <para>
+            The term "package" can also be used to describe recipes.
+            However, since the same word is used for the packaged output from the Yocto 
+            Project (i.e. <filename>.ipk</filename> or <filename>.deb</filename> files), 
+            this document avoids using the term "package" to refer to recipes.
+        </para>
+    </section>
+
+    <section id='usingpoky-components-classes'>
+        <title>Classes</title>
+
+        <para>
+            Class files (<filename>.bbclass</filename>) contain information that is useful to share
+            between metadata files. 
+            An example is the Autotools class, which contains
+            common settings for any application that Autotools uses.
+            The <link linkend='ref-classes'>Reference: Classes</link> appendix provides details
+            about common classes and how to use them.
+        </para>
+    </section>
+
+    <section id='usingpoky-components-configuration'>
+        <title>Configuration</title>
+
+        <para>
+            The configuration files (<filename>.conf</filename>) define various configuration variables
+            that govern the Yocto Project build process. 
+            These files fall into several areas that define machine configuration options, 
+            distribution configuration options, compiler tuning options, general common configuration
+            options and user configuration options (<filename>local.conf</filename>, which is found
+            in the Yocto Project files build directory).
+        </para>
+    </section>
+</section>
+
+
 <section id='usingpoky-build'>
     <title>Running a Build</title>
 
     <para>
-        You can find general information on how to build an image using the 
-        Yocto Project in the 
-        "<ulink url='&YOCTO_DOCS_QS_URL;#building-image'>Building an Image</ulink>"
-        section of The Yocto Project Quick Start.
-        This section provides a summary of the build process and provides information
-        for less obvious aspects of the build process.
+        You can find information on how to build an image using the Yocto Project in the 
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html#building-image'>
+        Building an Image</ulink> section of the 
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
+        Yocto Project Quick Start</ulink>.
+        This section provides a quick overview.
     </para>
 
-    <section id='build-overview'>
-        <title>Build Overview</title>
+    <para>
+        The first thing you need to do is set up the Yocto Project build environment by sourcing
+        the environment setup script as follows:
+        <literallayout class='monospaced'>
+     $ source oe-init-build-env [build_dir];
+        </literallayout>
+    </para>
 
-        <para>
-            The first thing you need to do is set up the Yocto Project build environment by sourcing
-            the environment setup script as follows:
-            <literallayout class='monospaced'>
-     $ source oe-init-build-env [build_dir]
-            </literallayout>
-        </para>
+    <para>
+        The <filename>build_dir</filename> is optional and specifies the directory Yocto Project
+        uses for the build.
+        If you do not specify a build directory it defaults to <filename>build</filename>
+        in the Yocto Project files directory structure.
+        A common practice is to use a different build directory for different targets. 
+        For example, <filename>~/build/x86</filename> for a <filename>qemux86</filename>
+        target, and <filename>~/build/arm</filename> for a <filename>qemuarm</filename> target.
+        See <link linkend="structure-core-script">oe-init-build-env</link>
+        for more information on this script.
+    </para>
 
-        <para>
-            The <filename>build_dir</filename> is optional and specifies the directory Yocto Project
-            uses for the build.
-            If you do not specify a build directory it defaults to <filename>build</filename>
-            in your current working directory.
-            A common practice is to use a different build directory for different targets. 
-            For example, <filename>~/build/x86</filename> for a <filename>qemux86</filename>
-            target, and <filename>~/build/arm</filename> for a <filename>qemuarm</filename> target.
-            See <link linkend="structure-core-script">oe-init-build-env</link>
-            for more information on this script.
-        </para>
-
-        <para>
-            Once the Yocto Project build environment is set up, you can build a target using:
-            <literallayout class='monospaced'>
+    <para>
+        Once the Yocto Project build environment is set up, you can build a target using:
+        <literallayout class='monospaced'>
      $ bitbake &lt;target&gt;
-            </literallayout>
-        </para>
+        </literallayout>
+    </para>
 
-        <para>
-            The <filename>target</filename> is the name of the recipe you want to build. 
-            Common targets are the images in <filename>meta/recipes-core/images</filename>,
-            <filename>/meta/recipes-sato/images</filename>, etc. all found in the Yocto Project
-            files.
-            Or, the target can be the name of a recipe for a specific piece of software such as 
-            <application>busybox</application>. 
-            For more details about the images the Yocto Project supports, see the 
-            "<link linkend="ref-images">Reference: Images</link>" appendix.
-        </para>
+    <para>
+        The <filename>target</filename> is the name of the recipe you want to build. 
+        Common targets are the images in <filename>meta/recipes-core/images</filename>,
+        <filename>/meta/recipes-sato/images</filename>, etc. all found in the Yocto Project
+        files.
+        Or, the target can be the name of a recipe for a specific piece of software such as 
+        <application>busybox</application>. 
+        For more details about the images Yocto Project supports, see the 
+        <link linkend="ref-images">'Reference: Images'</link> appendix.
+    </para>
 
-        <note>
-            Building an image without GNU Public License Version 3 (GPLv3) components is 
-            only supported for minimal and base images.
-            See the "<link linkend='ref-images'>Reference: Images</link>" appendix for more information.
-        </note>
-    </section>
+    <note>
+        Building an image without GNU Public License Version 3 (GPLv3) components is 
+        only supported for minimal and base images.
+        See <link linkend='ref-images'>'Reference: Images'</link> for more information.
+    </note>
 
-    <section id='building-an-image-using-gpl-components'>
-        <title>Building an Image Using GPL Components</title>
-
-        <para>
-            When building an image using GPL components, you need to maintain your original 
-            settings and not switch back and forth applying different versions of the GNU
-            Public License.  
-            If you rebuild using different versions of GPL, dependency errors might occur
-            due to some components not being rebuilt.
-        </para>
-    </section>
+    <note>
+        When building an image using GPL components, you need to maintain your original 
+        settings and not switch back and forth applying different versions of the GNU
+        Public License.  
+        If you rebuild using different versions of GPL, dependency errors might occur
+        due to some components not being rebuilt.
+    </note>
 </section>
 
 <section id='usingpoky-install'>
@@ -93,8 +219,10 @@
         <filename class="directory">tmp/deploy/images</filename>. 
         For information on how to run pre-built images such as <filename>qemux86</filename> 
         and <filename>qemuarm</filename>, see the
-        "<ulink url='&YOCTO_DOCS_QS_URL;#using-pre-built'>Using Pre-Built Binaries and QEMU</ulink>"
-        section in the Yocto Project Quick Start.
+        <ulink url='http://www.yoctoproject.org//docs/yocto-quick-start/yocto-project-qs.html#using-pre-built'>
+        Using Pre-Built Binaries and QEMU</ulink> section in the 
+        <ulink url='http://www.yoctoproject.org//docs/yocto-quick-start/yocto-project-qs.html'>
+        Yocto Project Quick Start</ulink>.
         For information about how to install these images, see the documentation for your
         particular board/machine.
     </para>
@@ -179,7 +307,7 @@
             You can view a list of tasks in a given package by running the
             <filename>listtasks</filename> task as follows:
             <literallayout class='monospaced'>
-     $ bitbake matchbox-desktop -c listtasks
+     $ bitbake matchbox-desktop -c
             </literallayout>
             The results are in the file <filename>${WORKDIR}/temp/log.do_listtasks</filename>.
         </para>
@@ -295,7 +423,7 @@
          if fatal_error:
              bb.fatal("fatal_error detected, unable to print the task list")
          bb.plain("The tasks present are abc")
-         bb.debug(2, "Finished figuring out the tasklist")
+         bb.debug(2, "Finished figureing out the tasklist")
      }
                 </literallayout>
             </para>

documentation/poky.ent

@@ -1,48 +0,0 @@
-<!ENTITY DISTRO "1.1.2">
-<!ENTITY DISTRO_NAME "edison">
-<!ENTITY YOCTO_DOC_VERSION "1.1.2">
-<!ENTITY POKYVERSION "6.0.2">
-<!ENTITY YOCTO_POKY "poky-&DISTRO_NAME;-&POKYVERSION;">
-<!ENTITY COPYRIGHT_YEAR "2010-2012">
-<!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org">
-<!ENTITY YOCTO_HOME_URL "http://www.yoctoproject.org">
-<!ENTITY YOCTO_LISTS_URL "http://lists.yoctoproject.org">
-<!ENTITY YOCTO_BUGZILLA_URL "http://bugzilla.yoctoproject.org">
-<!ENTITY YOCTO_WIKI_URL "https://wiki.yoctoproject.org">
-<!ENTITY YOCTO_AB_URL "http://autobuilder.yoctoproject.org">
-<!ENTITY YOCTO_GIT_URL "http://git.yoctoproject.org">
-<!ENTITY YOCTO_ADTREPO_URL "http://adtrepo.yoctoproject.org">
-<!ENTITY OE_HOME_URL "http://www.openembedded.org">
-<!ENTITY OE_DOCS_URL "http://docs.openembedded.org">
-<!ENTITY OH_HOME_URL "http://o-hand.com">
-<!ENTITY BITBAKE_HOME_URL "http://developer.berlios.de/projects/bitbake/">
-<!ENTITY BITBAKE_DOCS_URL "http://bitbake.berlios.de/manual/">
-<!ENTITY ECLIPSE_MAIN_URL "http://www.eclipse.org/downloads">
-<!ENTITY ECLIPSE_DL_URL "http://download.eclipse.org">
-<!ENTITY ECLIPSE_DL_PLUGIN_URL "&YOCTO_DL_URL;/releases/eclipse-plugin/&DISTRO;">
-<!ENTITY ECLIPSE_UPDATES_URL "&ECLIPSE_DL_URL;/tm/updates/3.3">
-<!ENTITY ECLIPSE_INDIGO_URL "&ECLIPSE_DL_URL;/releases/indigo">
-<!ENTITY ECLIPSE_INDIGO_CDT_URL "&ECLIPSE_DL_URL;tools/cdt/releases/indigo">
-<!ENTITY YOCTO_DOCS_URL "&YOCTO_HOME_URL;/docs">
-<!ENTITY YOCTO_SOURCES_URL "&YOCTO_HOME_URL;/sources/">
-<!ENTITY YOCTO_AB_PORT_URL "&YOCTO_AB_URL;:8010">
-<!ENTITY YOCTO_AB_NIGHTLY_URL "&YOCTO_AB_URL;/nightly/">
-<!ENTITY YOCTO_POKY_URL "&YOCTO_DL_URL;/releases/poky/">
-<!ENTITY YOCTO_RELEASE_DL_URL "&YOCTO_DL_URL;/releases/yocto/yocto-&DISTRO;">
-<!ENTITY YOCTO_TOOLCHAIN_DL_URL "&YOCTO_RELEASE_DL_URL;/toolchain/">
-<!ENTITY YOCTO_ECLIPSE_DL_URL "&YOCTO_RELEASE_DL_URL;/eclipse-plugin/indigo;">
-<!ENTITY YOCTO_ADTINSTALLER_DL_URL "&YOCTO_RELEASE_DL_URL;/adt_installer">
-<!ENTITY YOCTO_POKY_DL_URL "&YOCTO_RELEASE_DL_URL;/&YOCTO_POKY;.tar.bz2">
-<!ENTITY YOCTO_MACHINES_DL_URL "&YOCTO_RELEASE_DL_URL;/machines">
-<!ENTITY YOCTO_QEMU_DL_URL "&YOCTO_MACHINES_DL_URL;/qemu">
-<!ENTITY YOCTO_PYTHON-i686_DL_URL "&YOCTO_DL_URL;/releases/miscsupport/python-nativesdk-standalone-i686.tar.bz2">
-<!ENTITY YOCTO_PYTHON-x86_64_DL_URL "&YOCTO_DL_URL;/releases/miscsupport/python-nativesdk-standalone-x86_64.tar.bz2">
-<!ENTITY YOCTO_DOCS_QS_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/yocto-project-qs/yocto-project-qs.html">
-<!ENTITY YOCTO_DOCS_ADT_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/adt-manual/adt-manual.html">
-<!ENTITY YOCTO_DOCS_REF_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/poky-ref-manual/poky-ref-manual.html">
-<!ENTITY YOCTO_DOCS_BSP_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/bsp-guide/bsp-guide.html">
-<!ENTITY YOCTO_DOCS_DEV_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/dev-manual/dev-manual.html">
-<!ENTITY YOCTO_DOCS_KERNEL_URL "&YOCTO_DOCS_URL;/&YOCTO_DOC_VERSION;/kernel-manual/kernel-manual.html">
-<!ENTITY YOCTO_ADTPATH_DIR "/opt/poky/&DISTRO;">
-<!ENTITY YOCTO_POKY_TARBALL "&YOCTO_POKY;.tar.bz2">
-<!ENTITY OE_INIT_PATH "&YOCTO_POKY;/oe-init-build-env">

documentation/yocto-project-qs/style.css

@@ -654,7 +654,7 @@ hr {
 
 
 .tip, .warning, .caution, .note {
-  border-color: #fff;
+  border-color: #aaa;
 }
 
 
@@ -662,24 +662,24 @@ hr {
 .warning table th,
 .caution table th,
 .note table th {
-  border-bottom-color: #fff;
+  border-bottom-color: #aaa;
 }
 
 
 .warning {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .caution {
-  background-color: #f0f0f2;
+  background-color: #fea;
 }
 
 .tip {
-  background-color: #f0f0f2;
+  background-color: #eff;
 }
 
 .note {
-  background-color: #f0f0f2; 
+  background-color: #dfc;
 }
 
 .glossary dl dt, 
@@ -946,8 +946,8 @@ table {
 
 .tip,
 .note {
-   background: #f0f0f2; 
-   color: #333;   
+   background: #666666;
+   color: #fff;   
    padding: 20px;
    margin: 20px;
 }
@@ -958,26 +958,11 @@ table {
    margin: 0em;
    font-size: 2em;
    font-weight: bold;
-   color: #333;   
+   color: #fff;   
 }
 
 .tip a,
 .note a {
-   color: #333;   
+   color: #fff;   
    text-decoration: underline;
 }
-
-.footnote {
-   font-size: small;
-   color: #333;
-}
-
-/* Changes the announcement text */
-.tip h3,
-.warning h3,
-.caution h3,
-.note h3 {
-   font-size:large;
-   color: #00557D;
-}
-

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

@@ -1,13 +1,12 @@
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" 
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" 
-[<!ENTITY % poky SYSTEM "../poky.ent"> %poky; ] >
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <article id='intro'>
    <imagedata fileref="figures/yocto-project-transp.png" width="6in" depth="1in" align="right" scale="25" />
 
 <section id='fake-title'>
-    <title>The Yocto Project Quick Start</title>
-    <para>Copyright &copy; &COPYRIGHT_YEAR; Linux Foundation</para>
+    <title>Yocto Project Quick Start</title>
+    <para>Copyright &copy; 2010-2011 Linux Foundation</para>
 </section>
 
 <section id='welcome'>
@@ -19,37 +18,33 @@
         Amongst other things, the Yocto Project uses the Poky build system to 
         construct complete Linux images.
     </para>
-
     <para>
         This short document will give you some basic information about the environment as well 
         as let you experience it in its simplest form.  
-        After reading this document, you will have a basic understanding of what the Yocto Project is
+        After reading this document you will have a basic understanding of what the Yocto Project is
         and how to use some of its core components.  
         This document steps you through a simple example showing you how to build a small image 
         and run it using the QEMU emulator.
     </para>
-
     <para>
-        For more detailed information on the Yocto Project, you should check out these resources:
-        <itemizedlist>
-            <listitem><para><emphasis>Website:</emphasis> The <ulink url='&YOCTO_HOME_URL;'>Yocto Project Website</ulink>
-                provides the latest builds, breaking news, full development documentation, and a rich Yocto 
-                Project Development Community into which you can tap.
-                </para></listitem>
-            <listitem><para><emphasis>FAQs:</emphasis> Lists commonly asked Yocto Project questions and answers.
-                You can find two FAQs: <ulink url='&YOCTO_WIKI_URL;/wiki/FAQ'>Yocto Project FAQ</ulink> on 
-                a wiki, and the 
-                <ulink url='&YOCTO_DOCS_REF_URL;#faq'>FAQ</ulink> appendix in the 
-                The Yocto Project Reference Manual.
-                </para></listitem>
-        </itemizedlist>
+        For complete information on the Yocto Project, you should check out the 
+        <ulink url='http://www.yoctoproject.org'>Yocto Project Website</ulink>.
+        You can find the latest builds, breaking news, full development documentation, and a 
+        rich Yocto Project Development Community into which you can tap.
+    </para>
+    <para>
+        Finally, you might find the Frequently Asked Questions (FAQ) for the Yocto Project
+        at <ulink url='https://wiki.yoctoproject.org/wiki/FAQ'>Yocto Project FAQ</ulink> and 
+        the FAQ appendix located in the 
+        <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
+        Yocto Project Reference Manual</ulink> helpful.
     </para>
     <note>
         Due to production processes, there could be differences between the Yocto Project
         documentation bundled in the release tarball and the 
-        <ulink url='&YOCTO_DOCS_QS_URL;'>
+        <ulink url='http://www.yoctoproject.org/docs/1.1/yocto-project-qs/yocto-project-qs.html'>
         Yocto Project Quick Start</ulink> on
-        the <ulink url='&YOCTO_HOME_URL;'>Yocto Project</ulink> website.
+        the <ulink url='http://www.yoctoproject.org'>Yocto Project</ulink> website.
         For the latest version of this manual, see the manual on the website.
     </note>
 </section>
@@ -79,7 +74,7 @@
      </mediaobject>
 
     <para>
-        Here are some highlights for the Yocto Project:
+        Yocto Project:
     </para>
 
     <itemizedlist>
@@ -90,7 +85,7 @@
             <para>Makes available system components such as X11, Matchbox, GTK+, Pimlico, Clutter,
             GuPNP and Qt (among others) so you can create a richer user interface experience on 
             devices that use displays or have a GUI.
-            For devices that don't have a GUI or display, you simply would not employ these 
+            For devices that don't have a GUI or display you simply would not employ these 
             components.</para>
         </listitem>
         <listitem>
@@ -105,9 +100,9 @@
 
     <para>
         The Yocto Project can generate images for many kinds of devices.  
-        However, the standard example machines target QEMU full-system emulation for x86, x86-64, ARM, MIPS,
-        and PPC-based architectures as well as specific hardware such as the 
-        <trademark class='registered'>Intel</trademark> Desktop Board DH55TC.  
+        However, the standard example machines target QEMU full system emulation for x86, ARM, MIPS,
+        and PPC-based architectures as well as specific hardware such as the Intel Desktop Board
+        DH55TC.  
         Because an image developed with the Yocto Project can boot inside a QEMU emulator, the 
         development environment works nicely as a test platform for developing embedded software.
     </para>
@@ -118,7 +113,7 @@
         restricted screen sizes, sits neatly on top of a device using the 
         GNOME Mobile Stack and provides a well-defined user experience. 
         Implemented in its own layer, it makes it clear to developers how they can implement 
-        their own user interface on top of Yocto Linux.
+        their own UIs on top of Yocto Linux.
     </para>
 </section>
 
@@ -133,10 +128,11 @@
         <listitem>
             <para>A host system running a supported Linux distribution (i.e. recent releases of
                 Fedora, openSUSE, Debian, and Ubuntu).
-                If the host system supports multiple cores and threads, you can configure the 
-                Yocto Project build system to decrease the time needed to build images
-                significantly.
-            </para>
+            <note>
+                For notes about using the Yocto Project on development systems that use 
+                older Linux distributions see 
+                <ulink url='https://wiki.yoctoproject.org/wiki/BuildingOnRHEL4'></ulink>
+            </note></para>
         </listitem>
         <listitem>
             <para>The right packages.</para>
@@ -150,23 +146,15 @@
         <title>The Linux Distribution</title>
 
         <para>
-            The Yocto Project team is continually verifying more and more Linux 
-            distributions with each release.
-            In general, if you have the current release minus one of the following 
-            distributions you should have no problems.
+            The Yocto Project has been tested and is known to work on the current releases minus one
+            of the following distributions. 
+            Follow this <ulink url='https://wiki.pokylinux.org/wiki/Distro_Test'>link </ulink> for more 
+            information on distribution testing.
             <itemizedlist>
                 <listitem><para>Ubuntu</para></listitem>
                 <listitem><para>Fedora</para></listitem>
                 <listitem><para>openSUSE</para></listitem>
             </itemizedlist>
-            For a list of the distributions under validation and their status, see the
-            <ulink url='&YOCTO_WIKI_URL;/wiki/Distribution_Support'>Distribution
-            Support</ulink> wiki page.
-            <note>
-                For notes about using the Yocto Project on a RHEL 4-based host, see the
-                <ulink url='&YOCTO_WIKI_URL;/wiki/BuildingOnRHEL4'>BuildingOnRHEL4</ulink>
-                wiki page.
-            </note>
             </para>
         <para>
             The build system should be able to run on any modern distribution with Python 2.6 or 2.7.
@@ -178,12 +166,12 @@
             If you attempt to use a distribution not in the above list, you may or may not have success - you 
             are venturing into untested territory.
             Refer to  
-            <ulink url='&OE_HOME_URL;/index.php?title=OEandYourDistro&amp;action=historysubmit&amp;diff=4309&amp;okdid=4225'>OE and Your Distro</ulink> and 
-            <ulink url='&OE_HOME_URL;/index.php?title=Required_software&amp;action=historysubmit&amp;diff=4311&amp;oldid=4251'>Required Software</ulink> 
-            for information for other distributions used with the OpenEmbedded project, which might be
+            <ulink url='http://openembedded.net/index.php?title=OEandYourDistro&amp;action=historysubmit&amp;diff=4309&amp;okdid=4225'>OE and Your Distro</ulink> and 
+            <ulink url='http://openembedded.net/index.php?title=Required_software&amp;action=historysubmit&amp;diff=4311&amp;oldid=4251'>Required Software</ulink> 
+            for information for other distributions used with the Open Embedded project, which might be
             a starting point for exploration.
             If you go down this path, you should expect problems.
-            When you do, please go to <ulink url='&YOCTO_BUGZILLA_URL;'>Yocto Project Bugzilla</ulink>
+            When you do, please go to <ulink url='http://bugzilla.yoctoproject.org'>Yocto Project Bugzilla</ulink>
             and submit a bug.
             We are interested in hearing about your experience.
         </para></note>
@@ -195,103 +183,65 @@
         <para>
             Packages and package installation vary depending on your development system.  
             In general, you need to have root access and then install the required packages.
-            The next few sections show you how to get set up with the right packages for
-            Ubuntu, Fedora, and openSUSE.
         </para>
-  
-        <section id='ubuntu'>
-            <title>Ubuntu</title>
 
-            <para>
-                If your distribution is Ubuntu, you need to be running the bash shell.  
-                You can be sure you are running this shell by entering the following command and 
-                selecting "No" at the prompt:
-                <literallayout class='monospaced'>
-     $ sudo dpkg-reconfigure dash
-                </literallayout>
-            </para>
+        <note><para>
+            If you are using a Fedora version prior to version 15 you will need to take some 
+            extra steps to enable <filename>sudo</filename>.
+            See <ulink url='https://fedoraproject.org/wiki/Configuring_Sudo'></ulink> for details.
+        </para></note>
 
-            <para>
-                The packages you need for a supported Ubuntu distribution are shown in the following command:
-            </para>
+        <para>
+            The packages you need for a Debian-based host are shown in the following command:
+        </para>
 
-                <literallayout class='monospaced'>
+            <literallayout class='monospaced'>
      $ sudo apt-get install sed wget cvs subversion git-core coreutils \
-     unzip texi2html texinfo libsdl1.2-dev docbook-utils gawk fop \
-     python-pysqlite2 diffstat help2man make gcc build-essential xsltproc \
+     unzip texi2html texinfo libsdl1.2-dev docbook-utils gawk \
+     python-pysqlite2 diffstat help2man make gcc build-essential \
      g++ desktop-file-utils chrpath libgl1-mesa-dev libglu1-mesa-dev \
      mercurial autoconf automake groff libtool xterm
-                </literallayout>
-        </section>
+            </literallayout>
 
-        <section id='fedora'>
-            <title>Fedora</title>
+        <para>
+            The packages you need for an RPM-based host like Fedora and openSUSE, 
+            respectively, are as follows:
+        </para>
 
-            <para>
-                The packages you need for a supported Fedora distribution are shown in the following
-                commands:
-            </para>
-
-                <literallayout class='monospaced'>
+            <literallayout class='monospaced'>
      $ sudo yum groupinstall "development tools"
      $ sudo yum install python m4 make wget curl ftp hg tar bzip2 gzip \
      unzip python-psyco perl texinfo texi2html diffstat openjade \
-     docbook-style-dsssl sed docbook-style-xsl docbook-dtds fop xsltproc \
-     docbook-utils sed bc eglibc-devel ccache pcre pcre-devel quilt \
+     docbook-style-dsssl sed docbook-style-xsl docbook-dtds \
+     docbook-utils sed bc glibc-devel ccache pcre pcre-devel quilt \
      groff linuxdoc-tools patch linuxdoc-tools cmake help2man \
      perl-ExtUtils-MakeMaker tcl-devel gettext chrpath ncurses apr \
      SDL-devel mesa-libGL-devel mesa-libGLU-devel gnome-doc-utils \
      autoconf automake libtool xterm
-                </literallayout>
+            </literallayout>
 
-            <note><para>
-                If you are using a Fedora version prior to version 15, you will need to take some 
-                extra steps to enable <filename>sudo</filename>, or you will need to run
-                the commands as root user.
-                See the <ulink url='https://fedoraproject.org/wiki/Configuring_Sudo'>Configuring Sudo</ulink> 
-                wiki page for details.
-            </para></note>
-        </section>
-
-        <section id='opensuse'>
-            <title>openSUSE</title>
-
-            <para>
-                The packages you need for a supported openSUSE distribution are shown in the following 
-                command:
-            </para>
-
-                <literallayout class='monospaced'>
-     $ sudo zypper install python gcc gcc-c++ libtool fop \
-     subversion git chrpath automake make wget help2man xsltproc \
-     diffstat texinfo mercurial freeglut-devel libSDL-devel
-                </literallayout>
-        </section>
+            <literallayout class='monospaced'>
+     $ sudo zypper install python gcc gcc-c++ libtool \
+     subversion git chrpath automake \
+     help2man diffstat texinfo mercurial wget
+            </literallayout>
+ 
     </section>
 
     <section id='releases'>
         <title>Yocto Project Release</title>
             
         <para>
-            You can download the latest Yocto Project release by going to the 
-            <ulink url="&YOCTO_HOME_URL;/download">Yocto Project Download page</ulink>.
+            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="&YOCTO_AB_NIGHTLY_URL;"></ulink>.  
+            <ulink url="http://autobuilder.yoctoproject.org/nightly/"></ulink>.  
             However, for this document a released version of Yocto Project is used.
         </para>
-
-        <para>
-            You can also get the Yocto Project files by setting up a Git repository on your host
-            development system. 
-            Doing so allows you to contribute back to the project.
-            For information on how to get set up using this method, see the 
-            "<ulink url='&YOCTO_DOCS_DEV_URL;#local-yp-release'>Yocto 
-            Project Release</ulink>" item in The Yocto Project Development Manual.
-        </para>
     </section>
 </section>
 
@@ -299,16 +249,16 @@
     <title>A Quick Test Run</title>
 
     <para>
-        Now that you have your system requirements in order, you can give the Yocto Project a try.  
+        Now that you have your system requirements in order you can give Yocto Project a try.  
         This section presents some steps that let you do the following:
     </para>
 
     <itemizedlist>
         <listitem>
-            <para>Build an image and run it in the QEMU emulator</para>
+            <para>Build an image and run it in the emulator</para>
         </listitem>
         <listitem>
-            <para>Use a pre-built image and run it in the QEMU emulator</para>
+            <para>Or, use a pre-built image and run it in the emulator</para>
         </listitem>
     </itemizedlist>
 
@@ -316,8 +266,7 @@
         <title>Building an Image</title>
  
         <para>
-            In the development environment you will need to build an image whenever you change hardware 
-            support, add or change system libraries, or add or change services that have dependencies.
+            In the development environment you will need to build an image whenever you change hardware support, add or change system libraries, or add or change services that have dependencies.
         </para>
 
         <mediaobject>
@@ -345,76 +294,50 @@
              By default, the Yocto Project searches for source code using a pre-determined order
              through a set of locations.
              If you encounter problems with the Yocto Project finding and downloading source code, see
-             the FAQ entry "How does the Yocto Project build system obtain source code and will it work behind my
-             firewall or proxy server?" in  
-             <ulink url='&YOCTO_DOCS_REF_URL;#faq'>
-             The Yocto Project Reference Manual</ulink>.
+             the FAQ entry "How does Poky obtain source code and will it work behind my
+             firewall or proxy server?" in the 
+             <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
+             Yocto Project Reference Manual</ulink>.
          </para></note>
 
          <para>
              <literallayout class='monospaced'>
-     $ wget &YOCTO_POKY_DL_URL;
-     $ tar xjf &YOCTO_POKY;.tar.bz2
-     $ source &OE_INIT_PATH; &YOCTO_POKY;-build
+     $ wget http://www.yoctoproject.org/downloads/poky/poky-bernard-5.0.1.tar.bz2
+     $ tar xjf poky-bernard-5.0.1.tar.bz2
+     $ source poky-bernard-5.0.1/poky-init-build-env poky-5.0.1-build
              </literallayout>
          </para>
 
          <tip><para>
-             To help conserve disk space during builds, you can add the following statement
-             to your project's configuration file, which for this example
-             is <filename>&YOCTO_POKY;-build/conf/local.conf</filename>.
+             To help conserve disk space during builds you can add the following statement
+             to your <filename>local.conf</filename> file.  
              Adding this statement deletes the work directory used for building a package
              once the package is built.
              <literallayout class='monospaced'>
-     INHERIT += "rm_work"
+     INHERIT += rm_work
              </literallayout>
          </para></tip>
 
          <itemizedlist>
-             <listitem><para>In the previous example, the first command retrieves the Yocto Project
-                 release tarball from the source repositories using the
-                 <filename>wget</filename> command.
-                 Alternatively, you can go to the 
-                 <ulink url='&YOCTO_HOME_URL;/download'>Yocto Project website's Downloads page</ulink>
-                 to retrieve the tarball.</para></listitem>
-             <listitem><para>The second command extracts the files from the tarball and places 
-                 them into a directory named <filename>&YOCTO_POKY;</filename> in the current 
-                 directory.</para></listitem>
-             <listitem><para>The third command runs the Yocto Project environment setup script.
-                 Running this script defines Yocto Project build environment settings needed to 
-                 complete the build.
-                 The script also creates the Yocto Project
-                 build directory, which is <filename>&YOCTO_POKY;-build</filename> in this case.
-                 After the script runs, your current working directory is set 
-                 to the build directory.
-                 Later, when the build completes, the build directory contains all the files 
-                 created during the build.
-                 </para></listitem>
+             <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.1-build</filename> directory and executes the <command>cd</command>
+             command to make <filename>poky-5.0.1-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 
+             <filename>conf/local.conf</filename> file.</para></listitem>
          </itemizedlist>
          <para>
-             Take some time to examine your <filename>local.conf</filename> file 
-             in your project's configuration directory.
-             The defaults in that file should work fine.
-             However, there are some variables of interest at which you might look.
-         </para>
-
-         <para>  
-             By default, the target architecture for the build is <filename>qemux86</filename>, 
-             which produces an image that can be used in the QEMU emulator and is targeted at an
-             <trademark class='registered'>Intel</trademark> 32-bit based architecture.
-             To change this default, edit the value of the <filename>MACHINE</filename> variable 
-             in the configuration file before launching the build.
-         </para>
-
-         <para>
-             Another couple of variables of interest are the 
-             <ulink url='&YOCTO_DOCS_REF_URL;#var-BB_NUMBER_THREADS'><filename>BB_NUMBER_THREADS</filename></ulink> and the 
-             <ulink url='&YOCTO_DOCS_REF_URL;#var-PARALLEL_MAKE'><filename>PARALLEL_MAKE</filename></ulink> variables.
-             By default, these variables are commented out. 
-             However, if you have a multi-core CPU you might want to uncomment
-             the lines and set both variables equal to twice the number of your 
-             host's processor cores.
+             Take some time to examine your <filename>conf/local.conf</filename> file found in the
+             Yocto Project file's <filename>conf</filename>.  
+             The defaults should work fine.  
+             However, if you have a multi-core CPU you might want to set the variable
+             BB_NUMBER_THREADS equal to twice the number of processor cores your system has.
+             And, set the variable PARALLEL_MAKE equal to the number of processor cores.
              Setting these variables can significantly shorten your build time.
+             By default, these variables are commented out.
          </para>
 
         <para>
@@ -422,27 +345,28 @@
             the image. 
             By default, the Yocto Project build system uses the RPM package manager.
             You can control this configuration by using the 
-            <filename><ulink url='&YOCTO_DOCS_REF_URL;#var-PACKAGE_CLASSES'><filename>PACKAGE_CLASSES</filename></ulink></filename> variable.  
+            <filename><ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#var-PACKAGE_CLASSES'>PACKAGE_CLASSES</ulink></filename> variable.  
              For additional package manager selection information, see 
-             "<ulink url='&YOCTO_DOCS_REF_URL;#ref-classes-package'>Packaging - <filename>package*.bbclass</filename></ulink>" 
-             in The Yocto Project Reference Manual.
+             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-classes-package'>Packaging - <filename>package*.bbclass</filename></ulink> in 
+             <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html'>
+             The Yocto Project Reference Manual</ulink>.
         </para>
 
          <para>
              Continue with the following command to build an OS image for the target, which is 
              <filename>core-image-sato</filename> in this example.
-             For information on the <filename>-k</filename> option use the 
-             <filename>bitbake --help</filename> command or see the
-             "<ulink url='&YOCTO_DOCS_REF_URL;#usingpoky-components-bitbake'>BitBake</ulink>" section in 
-             The Yocto Project Reference Manual.
+             For information on the <filename>&dash;k</filename> option use the 
+             <filename>bitbake --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 Yocto Project Reference Manual.
              <literallayout class='monospaced'>
      $ bitbake -k core-image-sato
              </literallayout>
              <note><para>
                  BitBake requires Python 2.6 or 2.7.  For more information on this requirement, 
-                 see the 
-                 <ulink url='&YOCTO_DOCS_REF_URL;#faq'>FAQ</ulink> in The Yocto Project Reference 
-                 Manual.
+                 see the FAQ appendix in the 
+                 <ulink url='http://www.yoctoproject.org/docs/poky-ref-manual/poky-ref-manual.html'>
+                 Yocto Project Reference Manual</ulink>.
              </para></note>
              The final command runs the image:
              <literallayout class='monospaced'>
@@ -459,13 +383,16 @@
 
     <section id='using-pre-built'>
         <title>Using Pre-Built Binaries and QEMU</title>
- 
         <para>
-            If hardware, libraries and services are stable, you can get started by using a pre-built binary 
-            of the filesystem image, kernel, and toolchain and run it using the QEMU emulator.  
+            If hardware, libraries and services are stable you can get started by using a pre-built binary 
+            of the image, kernel and toolchain and run it using the emulator QEMU.  
             This scenario is useful for developing application software.
         </para>
 
+        <para></para>
+        <para></para>
+        <para></para>
+
         <mediaobject>
             <imageobject>
             <imagedata fileref="figures/using-a-pre-built-image.png" format="PNG" align='center' scalefit='1'/>
@@ -473,39 +400,54 @@
             <caption>
                 <para>Using a Pre-Built Image</para>
             </caption>
-        </mediaobject>
+         </mediaobject>
 
-        <para>
-            For this scenario, you need to do several things:
-        </para>
+         <para>
+             For this scenario you need to do several things:
+         </para>
 
-        <itemizedlist>
-            <listitem><para>Install the appropriate stand-alone Yocto toolchain tarball.</para></listitem>
-            <listitem><para>Download the pre-built image that will boot with QEMU.  
-                You need to be sure to get the QEMU image that matches your target machine’s 
-                architecture (e.g. x86, ARM, etc.).</para></listitem>
-            <listitem><para>Download the filesystem image for your target machine's architecture.
-                </para></listitem>
-            <listitem><para>Set up the environment to emulate the hardware and then start the QEMU emulator.
-                </para></listitem>
-        </itemizedlist>
+         <itemizedlist>
+             <listitem>
+                 <para>
+                     Install the stand-alone Yocto toolchain tarball.
+                 </para>
+             </listitem>
+             <listitem>
+                 <para>
+                     Download the pre-built kernel that will boot with QEMU.  
+                     You need to be sure to get the QEMU image that matches your target machine’s 
+                     architecture (e.g. x86, ARM, etc.).
+                 </para>
+             </listitem>
+             <listitem>
+                 <para>
+                     Download the filesystem image for your target machine's architecture.
+                 </para>
+             </listitem>
+             <listitem>
+                 <para>
+                     Set up the environment to emulate the hardware and then start the QEMU emulator.
+                 </para>
+             </listitem>
+
+         </itemizedlist>
 
         <section id='installing-the-toolchain'>
-            <title>Installing the Toolchain</title>
-            <para>
-                You can download the pre-built toolchain, which includes the <filename>runqemu</filename> 
-                script and support files, from the appropriate directory under
-                <ulink url='&YOCTO_TOOLCHAIN_DL_URL;'></ulink>.  
-                Toolchains are available for 32-bit and 64-bit development systems from the 
-                <filename>i686</filename> and <filename>x86-64</filename> directories, respectively. 
-                Each type of development system supports five target architectures.
-                The tarball files are named such that a string representing the host system appears 
-                first in the filename and then is immediately followed by a string representing
-                the target architecture.
-            </para>
+        <title>Installing the Toolchain</title>
+         <para>
+             You can download the pre-built toolchain, which includes the <filename>runqemu</filename> 
+             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 
+             <filename>i686</filename> and <filename>x86_64</filename> folders, respectively. 
+             Each type of development system supports five target architectures.
+             The tarball files are named such that a string representing the host system appears 
+             first in the filename and then is immediately followed by a string representing
+             the target architecture.
+         </para>
 
-            <literallayout class='monospaced'>
-     poky-eglibc-&lt;<emphasis>host_system</emphasis>&gt;-&lt;<emphasis>arch</emphasis>&gt;-toolchain-gmae-&lt;<emphasis>release</emphasis>&gt;.tar.bz2
+         <literallayout class='monospaced'>
+     yocto-eglibc&lt;<emphasis>host_system</emphasis>&gt;-&lt;<emphasis>arch</emphasis>&gt;-toolchain-gmae-&lt;<emphasis>release</emphasis>&gt;.tar.bz2
 
      Where:
          &lt;<emphasis>host_system</emphasis>&gt; is a string representing your development system: 
@@ -515,111 +457,101 @@
                 i586, x86_64, powerpc, mips, or arm.
        
          &lt;<emphasis>release</emphasis>&gt; is the version of Yocto Project.
-            </literallayout>
+         </literallayout>
 
-            <para>       
-                For example, the following toolchain tarball is for a 64-bit development 
-                host system and a 32-bit target architecture:
-            </para>
+         <para>       
+             For example, the following toolchain tarball is for a 64-bit development 
+             host system and a 32-bit target architecture:
+         </para>
 
-            <literallayout class='monospaced'>
-     poky-eglibc-x86_64-i586-toolchain-gmae-&DISTRO;.tar.bz2
-            </literallayout>
+         <literallayout class='monospaced'>
+     yocto-eglibc-x86_64-i586-toolchain-gmae-1.1.tar.bz2
+         </literallayout>
 
-            <para>
-                The toolchain tarballs are self-contained and must be installed into <filename>/opt/poky</filename>.
-                The following commands show how you install the toolchain tarball given a 64-bit development host system
-                and a 32-bit target architecture.
-                The example assumes the toolchain tarball is located in <filename>~/toolchains/</filename>:
-            </para>
+         <para>
+             The toolchain tarballs are self-contained and must be installed into <filename>/opt/poky</filename>.
+             The following commands show how you install the toolchain tarball given a 64-bit development host system
+             and a 32-bit target architecture.
+             The example assumes the toolchain tarball is located in <filename>~/toolchains/</filename>:
+         </para>
 
-            <para>
-                <literallayout class='monospaced'>
+         <para>
+             <literallayout class='monospaced'>
      $ cd /
-     $ sudo tar -xvjf ~/toolchains/poky-eglibc-x86_64-i586-toolchain-gmae-&DISTRO;.tar.bz2
-                </literallayout>
-            </para>
-
-            <para>
-                For more information on how to install tarballs, see the 
-                "<ulink url='&YOCTO_DOCS_ADT_URL;#using-an-existing-toolchain-tarball'>Using a Cross-Toolchain Tarball</ulink>" and 
-                "<ulink url='&YOCTO_DOCS_ADT_URL;#using-the-toolchain-from-within-the-build-tree'>Using BitBake and the Yocto Project Build Tree</ulink>" sections in The Yocto Project Application Development Toolkit (ADT) 
-                User's Guide.
-            </para>
-        </section>
+     $ sudo tar -xvjf ~/toolchains/yocto-eglibc-x86_64-i586-toolchain-gmae-1.1.tar.bz2
+             </literallayout>
+         </para>
+         </section>
 
         <section id='downloading-the-pre-built-linux-kernel'>
-            <title>Downloading the Pre-Built Linux Kernel</title>
-      
-            <para>
-                You can download the pre-built Linux kernel suitable for running in the QEMU emulator from 
-                <ulink url='&YOCTO_QEMU_DL_URL;'></ulink>.
-                Be sure to use the kernel that matches the architecture you want to simulate.
-                Download areas exist for the five supported machine architectures:
-                <filename>qemuarm</filename>, <filename>qemumips</filename>, <filename>qemuppc</filename>,
-                <filename>qemux86</filename>, and <filename>qemux86-64</filename>.
-            </para>
-         
-            <para>  
-                Most kernel files have one of the following forms:
-                <literallayout class='monospaced'>
-     *zImage-qemu&lt;<emphasis>arch</emphasis>&gt;.bin
-     vmlinux-qemu&lt;<emphasis>arch</emphasis>&gt;.bin
+        <title>Downloading the Pre-Built Linux Kernel</title>
+         <para>
+             You can download the pre-built Linux kernel and the filesystem image suitable for 
+             running in the emulator QEMU from 
+             <ulink url='http://yoctoproject.org/downloads/yocto-1.0/machines/qemu'></ulink>.
+             Be sure to use the kernel and filesystem image that matches the architecture you want 
+             to simulate.
+             Download areas exist for the five supported machine architectures:
+             <filename>qemuarm</filename>, <filename>qemumips</filename>, <filename>qemuppc</filename>,
+             <filename>qemux86</filename>, and <filename>qemux86_64</filename>.
+         </para>
+       
+         <para>  
+             Most kernel files have one of the following forms:
+         </para>
+
+         <literallayout class='monospaced'>
+     *zImage-&lt;<emphasis>kernel-rev</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;-&lt;<emphasis>release</emphasis>&gt;*.bin
+     vmlinux-&lt;<emphasis>kernel-rev</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;-&lt;<emphasis>release</emphasis>&gt;*.bin
 
      Where:
+         &lt;<emphasis>kernel-rev</emphasis>&gt; is the base Linux kernel revision 
+                (e.g. 2.6.37).
+
          &lt;<emphasis>arch</emphasis>&gt; is a string representing the target architecture: 
                 x86, x86-64, ppc, mips, or arm.
-                </literallayout>
-            </para>
 
-            <para>
-                You can learn more about downloading a Yocto Project kernel in the 
-                "<ulink url='&YOCTO_DOCS_DEV_URL;#local-kernel-files'>Linux Yocto Kernel</ulink>" section of  
-                The Yocto Project Development Manual.
-            </para>
-        </section>
+         &lt;<emphasis>release</emphasis>&gt; is the version of Yocto Project. 
+         </literallayout>
+         </section>
 
         <section id='downloading-the-filesystem'>
-            <title>Downloading the Filesystem</title>
+        <title>Downloading the Filesystem</title>
+         <para>
+             The filesystem image has two tarball forms: <filename>ext3</filename> and 
+             <filename>tar</filename>.
+             You must use the <filename>ext3</filename> form when booting an image using the 
+             QEMU emulator.
+             The <filename>tar</filename> form can be flattened out in your host development system
+             and used for Yocto Project build purposes.
+         </para>
 
-            <para>
-                You can also download the filesystem image suitable for your target architecture from
-                <ulink url='&YOCTO_QEMU_DL_URL;'></ulink>.
-                Again, be sure to use the filesystem that matches the architecture you want 
-                to simulate.
-            </para>
-
-            <para>
-                The filesystem image has two tarball forms: <filename>ext3</filename> and 
-                <filename>tar</filename>.
-                You must use the <filename>ext3</filename> form when booting an image using the 
-                QEMU emulator.
-                The <filename>tar</filename> form can be flattened out in your host development system
-                and used for build purposes with the Yocto Project.
-                <literallayout class='monospaced'>
-     core-image-&lt;<emphasis>profile</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;.ext3
-     core-image-&lt;<emphasis>profile</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;.tar.bz2
+          <literallayout class='monospaced'>
+     yocto-image-&lt;<emphasis>profile</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;-&lt;<emphasis>release</emphasis>&gt;.rootfs.ext3.bz2
+     yocto-image-&lt;<emphasis>profile</emphasis>&gt;-qemu&lt;<emphasis>arch</emphasis>&gt;-&lt;<emphasis>release</emphasis>&gt;.rootfs.tar.bz2
 
      Where:
          &lt;<emphasis>profile</emphasis>&gt; is the filesystem image's profile:
-                   lsb, lsb-dev, lsb-sdk, lsb-qt3, minimal, minimal-dev, sato, sato-dev, or sato-sdk.
+                   lsb, lsb-dev, lsb-sdk, minimal, minimal-dev, sato, sato-dev, or sato-sdk.
                    For information on these types of image profiles, see
-                   <ulink url='&YOCTO_DOCS_REF_URL;#ref-images'>Reference: Images</ulink> in the Yocto Project Reference Manual.
+                   <ulink url='http://www.yoctoproject.org/docs/1.1/poky-ref-manual/poky-ref-manual.html#ref-images'>Reference: Images</ulink> in the Yocto Project Reference Manual.
 
          &lt;<emphasis>arch</emphasis>&gt; is a string representing the target architecture: 
                 x86, x86-64, ppc, mips, or arm.
-                </literallayout>
-            </para>
-        </section>
+
+         &lt;<emphasis>release</emphasis>&gt; is the version of Yocto Project. 
+          </literallayout>
+         </section>
 
         <section id='setting-up-the-environment-and-starting-the-qemu-emulator'>
-            <title>Setting Up the Environment and Starting the QEMU Emulator</title>
-           
-            <para>
-                Before you start the QEMU emulator, you need to set up the emulation environment.
-                The following command form sets up the emulation environment.
-                <literallayout class='monospaced'>
-     $ source &YOCTO_ADTPATH_DIR;/environment-setup-&lt;<emphasis>arch</emphasis>&gt;-poky-linux-&lt;<emphasis>if</emphasis>&gt; 
+        <title>Setting Up the Environment and Starting the QEMU Emulator</title>
+         <para>
+             Before you start the QEMU emulator you need to set up the emulation environment.
+             The following command form sets up the emulation environment.
+         </para>
+
+         <literallayout class='monospaced'>
+     $ source /opt/poky/1.1/environment-setup-&lt;<emphasis>arch</emphasis>&gt;-poky-linux-&lt;<emphasis>if</emphasis>&gt; 
 
      Where:
          &lt;<emphasis>arch</emphasis>&gt; is a string representing the target architecture: 
@@ -627,12 +559,13 @@
 
          &lt;<emphasis>if</emphasis>&gt; is a string representing an embedded application binary interface.
               Not all setup scripts include this string.
-                </literallayout>
-            </para>
+         </literallayout>
 
-            <para>
-                Finally, this command form invokes the QEMU emulator 
-                <literallayout class='monospaced'>
+         <para>
+              Finally, this command form invokes the QEMU emulator 
+         </para>
+
+         <literallayout class='monospaced'>
      $ runqemu &lt;<emphasis>qemuarch</emphasis>&gt; &lt;<emphasis>kernel-image</emphasis>&gt; &lt;<emphasis>filesystem-image</emphasis>&gt;
 
      Where:
@@ -643,34 +576,33 @@
 
          &lt;<emphasis>filesystem-image</emphasis>&gt; is the .ext3 filesystem image.
 
-                </literallayout>
-            </para>
+         </literallayout>
 
-            <para>
-                Continuing with the example, the following two commands setup the emulation 
-                environment and launch QEMU.
-                This example assumes the root filesystem (<filename>.ext3</filename> file) and 
-                the pre-built kernel image file both reside in your home directory. 
-                The kernel and filesystem are for a 32-bit target architecture.
-                <literallayout class='monospaced'>
-     $ cd $HOME
-     $ source &YOCTO_ADTPATH_DIR;/environment-setup-i586-poky-linux 
-     $ runqemu qemux86 bzImage-qemux86.bin \
-     core-image-sato-qemux86.ext3
-                </literallayout>
-            </para>
+         <para>
+             Continuing with the example, the following two commands setup the emulation 
+             environment and launch QEMU.
+             This example assumes the root filesystem tarball has been downloaded and expanded, and 
+             that the kernel and filesystem are for a 32-bit target architecture.
+         </para>
 
-            <para>
-                The environment in which QEMU launches varies depending on the filesystem image and on the 
-                target architecture.  
-                For example, if you source the environment for the ARM target 
-                architecture and then boot the minimal QEMU image, the emulator comes up in a new 
-                shell in command-line mode.  
-                However, if you boot the SDK image, QEMU comes up with a GUI.
-                <note>Booting the PPC image results in QEMU launching in the same shell in 
-                command-line mode.</note>
-            </para>
-        </section>     
+         <literallayout class='monospaced'>
+     $ source /opt/poky/1.1/environment-setup-i686-poky-linux 
+     $ runqemu qemux86 bzImage-3.0-qemux86-1.1.bin \
+     yocto-image-sato-qemux86-1.1.rootfs.ext3
+         </literallayout>
+
+         <para>
+             The environment in which QEMU launches varies depending on the filesystem image and on the 
+             target architecture.  For example, if you source the environment for the ARM target 
+             architecture and then boot the minimal QEMU image, the emulator comes up in a new 
+             shell in command-line mode.  However, if you boot the SDK image QEMU comes up with 
+             a GUI.
+         </para>
+ 
+         <note><para>
+             Booting the PPC image results in QEMU launching in the same shell in command-line mode.
+         </para></note>
+         </section>     
     </section>
 </section>
 

meta-demoapps/recipes-gnome/abiword/abiword-2.5.inc

@@ -17,6 +17,8 @@ FILES_${PN} += " \
 		${datadir}/abiword-${SHRT_VER}/scripts \
 		${datadir}/abiword-${SHRT_VER}/system.profile-en \
 		${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
+#		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
+#		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
 		${datadir}/abiword-${SHRT_VER}/templates/Employee-Directory.awt \
@@ -27,9 +29,6 @@ FILES_${PN} += " \
 		${datadir}/abiword-${SHRT_VER}/templates/Memo.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/Press-Release.awt "
 
-#		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
-#		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
-
 inherit autotools pkgconfig
 
 PARALLEL_MAKE = ""

meta-demoapps/recipes-gnome/abiword/abiword.inc

@@ -25,10 +25,9 @@ FILES_${PN} += " \
 		${datadir}/abiword-${SHRT_VER}/glade \
 		${datadir}/abiword-${SHRT_VER}/system.profile-en \
 		${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \
-  "
-
 #		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
 #		${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
+  "
 
 inherit autotools pkgconfig
 

meta-demoapps/recipes-sato/claws-mail/claws-mail.inc

@@ -22,6 +22,7 @@ FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
 EXTRA_OECONF = "--disable-aspell-test 		\
 		--disable-aspell 		\
 		--disable-manual		\
+#  		--disable-openssl 		\
 		--disable-crash-dialog		\
 		--disable-jpilot		\
 		--disable-trayicon-plugin	\
@@ -32,14 +33,12 @@ EXTRA_OECONF = "--disable-aspell-test 		\
 		--disable-pgpinline-plugin	\
   		--disable-dillo-viewer-plugin	\
 		--disable-clamav-plugin		\
+#		--disable-libetpan		\
 		--disable-gnomeprint		\
 		--disable-valgrind		\
     --disable-static    \
 		"
 
-#  		--disable-openssl 		\
-#		--disable-libetpan		\
-
 CFLAGS += "-D_GNU_SOURCE"
 
 inherit autotools pkgconfig gettext

meta-skeleton/recipes-skeleton/useradd/useradd-example.bb

@@ -17,12 +17,13 @@ PACKAGES =+ "${PN}-user3"
 
 inherit useradd
 
-# You must set USERADD_PACKAGES when you inherit useradd. This
-# lists which output packages will include the user/group
-# creation code.
+# Specify which package(s) should include the user/group code.
+# Make sure that any packages which install files owned by custom
+# users/groups are included here. The code which adds users and
+# groups is idempotent.
 USERADD_PACKAGES = "${PN} ${PN}-user3"
 
-# You must also set USERADD_PARAM and/or GROUPADD_PARAM when
+# You *must* set USERADD_PARAM and/or GROUPADD_PARAM when
 # you inherit useradd.
 
 # USERADD_PARAM specifies command line options to pass to the

meta-yocto/conf/distro/poky.conf

@@ -1,8 +1,8 @@
 DISTRO = "poky"
-DISTRO_NAME = "Yocto (Built by Poky 6.0.2)"
-DISTRO_VERSION = "1.1.2"
+DISTRO_NAME = "Yocto (Built by Poky 5.0)"
+DISTRO_VERSION = "1.1"
 SDK_VENDOR = "-pokysdk"
-SDK_VERSION := "${DISTRO_VERSION}"
+SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
 MAINTAINER = "Poky <poky@yoctoproject.org>"
 
@@ -18,11 +18,6 @@ PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.0%"
 PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.0%"
 PREFERRED_VERSION_linux-yocto_qemumips ?= "3.0%"
 PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.0%"
-PREFERRED_VERSION_linux-yocto-rt_qemux86 ?= "3.0%"
-PREFERRED_VERSION_linux-yocto-rt_qemux86-64 ?= "3.0%"
-PREFERRED_VERSION_linux-yocto-rt_qemuarm ?= "3.0%"
-PREFERRED_VERSION_linux-yocto-rt_qemumips ?= "3.0%"
-PREFERRED_VERSION_linux-yocto-rt_qemuppc ?= "3.0%"
 
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"

meta-yocto/conf/local.conf.sample

@@ -204,8 +204,8 @@ USER_CLASSES ?= "image-mklibs image-prelink"
 # newer Konsole versions behave
 #TERMCMD = "${XTERM_TERMCMD}"
 #TERMCMDRUN = "${XTERM_TERMCMDRUN}"
-# By default disable interactive patch resolution (tasks will just fail instead):
-PATCHRESOLVE = "noop"
+# You can disable interactive patch resolution (tasks will just fail instead) with:
+#PATCHRESOLVE = "noop"
 
 #
 # Shared-state files from other locations

meta-yocto/conf/local.conf.sample.extended

@@ -15,9 +15,6 @@
 
 #DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi nfs zeroconf pci ${DISTRO_FEATURES_LIBC}"
 
-# If you want to get an image based on gtk+directfb without x11, Please copy this variable to build/conf/local.conf
-#DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g directfb ${DISTRO_FEATURES_LIBC}"
-
 # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale
 # packages at build time using qemu-native. Disabling it (by setting it to 0)
 # will save some build time at the expense of breaking i18n on devices with

meta-yocto/conf/machine/atom-pc.conf

@@ -6,7 +6,7 @@
 include conf/machine/include/tune-atom.inc
 
 MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \
-                    acpi alsa"
+                    acpi"
 
 KERNEL_IMAGETYPE = "bzImage"
 

meta-yocto/recipes-bsp/beagleboard-audio/beagleboard-audio.bb

@@ -4,11 +4,11 @@ SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-PR = "r5"
+PR = "r4"
 
 inherit update-rc.d
 
-RDEPENDS_${PN} = "alsa-utils-amixer"
+RDEPENDS = "alsa-utils-amixer"
 
 SRC_URI = "file://beagleboard-audio"
 

meta/classes/autotools.bbclass

@@ -7,7 +7,7 @@ def autotools_dep_prepend(d):
 
 	if pn in ['autoconf-native', 'automake-native', 'help2man-native']:
 		return deps
-	deps += 'autoconf-native automake-native '
+	deps += 'autoconf-native automake-native help2man-native '
 
 	if not pn in ['libtool', 'libtool-native'] and not pn.endswith("libtool-cross"):
 		deps += 'libtool-native '
@@ -31,8 +31,6 @@ export CONFIG_SITE = "${@siteinfo_get_files(d)}"
 acpaths = "default"
 EXTRA_AUTORECONF = "--exclude=autopoint"
 
-export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir}"
-
 def autotools_set_crosscompiling(d):
 	if not bb.data.inherits_class('native', d):
 		return " cross_compiling=yes"
@@ -68,8 +66,10 @@ CONFIGUREOPTS = " --build=${BUILD_SYS} \
 
 oe_runconf () {
 	if [ -x ${S}/configure ] ; then
-		bbnote "Running ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
-		${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@" || bbfatal "oe_runconf failed"
+		cfgcmd="${S}/configure \
+		${CONFIGUREOPTS} ${EXTRA_OECONF} $@"
+		bbnote "Running $cfgcmd..."
+		$cfgcmd || bbfatal "oe_runconf failed" 
 	else
 		bbfatal "no configure script found"
 	fi

meta/classes/base.bbclass

@@ -283,7 +283,7 @@ python base_eventhandler() {
 		logfile.close()
 }
 
-addtask configure after do_patch
+addtask configure after do_unpack do_patch
 do_configure[dirs] = "${CCACHE_DIR} ${S} ${B}"
 do_configure[deptask] = "do_populate_sysroot"
 base_do_configure() {
@@ -327,7 +327,7 @@ python () {
 
     # If PRINC is set, try and increase the PR value by the amount specified
     princ = bb.data.getVar('PRINC', d, True)
-    if princ and princ != "0":
+    if princ:
         pr = bb.data.getVar('PR', d, True)
         pr_prefix = re.search("\D+",pr)
         prval = re.search("\d+",pr)
@@ -385,7 +385,7 @@ python () {
 
 
         dont_want_license = bb.data.getVar('INCOMPATIBLE_LICENSE', d, 1)
-        if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial"):
+        if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate"):
             hosttools_whitelist = (bb.data.getVar('HOSTTOOLS_WHITELIST_%s' % dont_want_license, d, 1) or "").split()
             lgplv2_whitelist = (bb.data.getVar('LGPLv2_WHITELIST_%s' % dont_want_license, d, 1) or "").split()
             dont_want_whitelist = (bb.data.getVar('WHITELIST_%s' % dont_want_license, d, 1) or "").split()

meta/classes/bootimg.bbclass

@@ -62,52 +62,13 @@ build_boot_bin() {
 
 	install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
 
-	# Calculate the size required for the final image including the
-	# data and filesystem overhead.
-	# Sectors: 512 bytes
-	#  Blocks: 1024 bytes
+	# Do a little math, bash style
+	#BLOCKS=`du -s ${HDDDIR} | cut -f 1`
+	BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
+	SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}`	
 
-	# Determine the sector count just for the data
-	SECTORS=$(expr $(du --apparent-size -ks ${HDDDIR} | cut -f 1) \* 2)
-
-	# Account for the filesystem overhead. This includes directory
-	# entries in the clusters as well as the FAT itself.
-	# Assumptions:
-	#   FAT32 (12 or 16 may be selected by mkdosfs, but the extra
-	#   padding will be minimal on those smaller images and not
-	#   worth the logic here to caclulate the smaller FAT sizes)
-	#   < 16 entries per directory
-	#   8.3 filenames only
-
-	# 32 bytes per dir entry
-	DIR_BYTES=$(expr $(find ${HDDDIR} | tail -n +2 | wc -l) \* 32)
-	# 32 bytes for every end-of-directory dir entry
-	DIR_BYTES=$(expr $DIR_BYTES + $(expr $(find ${HDDDIR} -type d | tail -n +2 | wc -l) \* 32))
-	# 4 bytes per FAT entry per sector of data
-	FAT_BYTES=$(expr $SECTORS \* 4)
-	# 4 bytes per FAT entry per end-of-cluster list
-	FAT_BYTES=$(expr $FAT_BYTES + $(expr $(find ${HDDDIR} -type d | tail -n +2 | wc -l) \* 4))
-
-	# Use a ceiling function to determine FS overhead in sectors
-	DIR_SECTORS=$(expr $(expr $DIR_BYTES + 511) / 512)
-	# There are two FATs on the image
-	FAT_SECTORS=$(expr $(expr $(expr $FAT_BYTES + 511) / 512) \* 2)
-	SECTORS=$(expr $SECTORS + $(expr $DIR_SECTORS + $FAT_SECTORS))
-
-	# Determine the final size in blocks accounting for some padding
-	BLOCKS=$(expr $(expr $SECTORS / 2) + ${BOOTIMG_EXTRA_SPACE})
-
-
-	# Ensure total sectors is an integral number of sectors per
-	# track or mcopy will complain. Sectors are 512 bytes, and we
-	# generate images with 32 sectors per track. This calculation is
-	# done in blocks, thus the mod by 16 instead of 32.
-	BLOCKS=$(expr $BLOCKS + $(expr 16 - $(expr $BLOCKS % 16)))
-
-	IMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
-	mkdosfs -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${IMG} ${BLOCKS}
-	# Copy HDDDIR recursively into the image file directly
-	mcopy -i ${IMG} -s ${HDDDIR}/* ::/
+	mkdosfs -n ${BOOTIMG_VOLUME_ID} -d ${HDDDIR} \
+	-C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg $SIZE 
 
 	syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
 	chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg

meta/classes/bugzilla.bbclass

@@ -1,186 +0,0 @@
-#
-# Small event handler to automatically open URLs and file
-# bug reports at a bugzilla of your choiche
-# it uses XML-RPC interface, so you must have it enabled
-#
-# Before using you must define BUGZILLA_USER, BUGZILLA_PASS credentials,
-# BUGZILLA_XMLRPC - uri of xmlrpc.cgi,
-# BUGZILLA_PRODUCT, BUGZILLA_COMPONENT - a place in BTS for build bugs
-# BUGZILLA_VERSION - version against which to report new bugs
-#
-
-def bugzilla_find_bug_report(debug_file, server, args, bugname):
-    args['summary'] = bugname
-    bugs = server.Bug.search(args)
-    if len(bugs['bugs']) == 0:
-        print >> debug_file, "Bugs not found"
-        return (False,None)
-    else: # silently pick the first result
-        print >> debug_file, "Result of bug search is "
-        print >> debug_file, bugs
-        status = bugs['bugs'][0]['status']
-        id = bugs['bugs'][0]['id']
-        return (not status in ["CLOSED", "RESOLVED", "VERIFIED"],id)
-
-def bugzilla_file_bug(debug_file, server, args, name, text, version):
-    args['summary'] = name
-    args['comment'] = text
-    args['version'] = version
-    args['op_sys'] = 'Linux'
-    args['platform'] = 'Other'
-    args['severity'] = 'normal'
-    args['priority'] = 'Normal'
-    try:
-        return server.Bug.create(args)['id']
-    except Exception, e:
-        print >> debug_file, repr(e)
-        return None
-
-def bugzilla_reopen_bug(debug_file, server, args, bug_number):
-    args['ids'] = [bug_number]
-    args['status'] = "CONFIRMED"
-    try:
-        server.Bug.update(args)
-        return True
-    except Exception, e:
-        print >> debug_file, repr(e)
-        return False
-
-def bugzilla_create_attachment(debug_file, server, args, bug_number, text, file_name, log, logdescription):
-    args['ids'] = [bug_number]
-    args['file_name'] = file_name
-    args['summary'] = logdescription
-    args['content_type'] = "text/plain"
-    args['data'] = log
-    args['comment'] = text
-    try:
-        server.Bug.add_attachment(args)
-        return True
-    except Exception, e:
-        print >> debug_file, repr(e)
-        return False
-
-def bugzilla_add_comment(debug_file, server, args, bug_number, text):
-    args['id'] = bug_number
-    args['comment'] = text
-    try:
-        server.Bug.add_comment(args)
-        return True
-    except Exception, e:
-        print >> debug_file, repr(e)
-        return False
-
-addhandler bugzilla_eventhandler
-python bugzilla_eventhandler() {
-    import bb, os, glob
-    import xmlrpclib, httplib
-
-    class ProxiedTransport(xmlrpclib.Transport):
-        def __init__(self, proxy, use_datetime = 0):
-            xmlrpclib.Transport.__init__(self, use_datetime)
-            self.proxy = proxy
-            self.user = None
-            self.password = None
-
-        def set_user(self, user):
-            self.user = user
-
-        def set_password(self, password):
-            self.password = password
-
-        def make_connection(self, host):
-            self.realhost = host
-            return httplib.HTTP(self.proxy)
-
-        def send_request(self, connection, handler, request_body):
-            connection.putrequest("POST", 'http://%s%s' % (self.realhost, handler))
-            if self.user != None:
-                if self.password != None:
-                    auth = "%s:%s" % (self.user, self.password)
-                else:
-                    auth = self.user
-                connection.putheader("Proxy-authorization", "Basic " + base64.encodestring(auth))
-
-    event = e
-    data = e.data
-    name = bb.event.getName(event)
-    if name == "MsgNote":
-       # avoid recursion
-       return
-
-    if name == "TaskFailed":
-        xmlrpc  = bb.data.getVar("BUGZILLA_XMLRPC", data, True)
-        user    = bb.data.getVar("BUGZILLA_USER",  data, True)
-        passw   = bb.data.getVar("BUGZILLA_PASS",  data, True)
-        product = bb.data.getVar("BUGZILLA_PRODUCT", data, True)
-        compon  = bb.data.getVar("BUGZILLA_COMPONENT", data, True)
-        version = bb.data.getVar("BUGZILLA_VERSION", data, True)
-
-        proxy   = bb.data.getVar('http_proxy', data, True )
-        if (proxy):
-            import urllib2
-            s, u, p, hostport = urllib2._parse_proxy(proxy)
-            transport = ProxiedTransport(hostport)
-        else:
-            transport = None
-
-        server = xmlrpclib.ServerProxy(xmlrpc, transport=transport, verbose=0)
-        args = {
-            'Bugzilla_login': user,
-            'Bugzilla_password': passw,
-            'product': product,
-            'component': compon}
-
-        # evil hack to figure out what is going on
-        debug_file = open(os.path.join(bb.data.getVar("TMPDIR", data, True),"..","bugzilla-log"),"a")
-
-        file = None
-        bugname = "%(package)s-%(pv)s-autobuild" % { "package" : bb.data.getVar("PN", data, True),
-                                                           "pv"      : bb.data.getVar("PV", data, True),
-                                                           }
-        log_file = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', event.data, True), event.task))
-        text     = "The %s step in %s failed at %s for machine %s" % (e.task, bb.data.getVar("PN", data, True), bb.data.getVar('DATETIME', data, True), bb.data.getVar( 'MACHINE', data, True ) )
-        if len(log_file) != 0:
-            print >> debug_file, "Adding log file %s" % log_file[0]
-            file = open(log_file[0], 'r')
-            log = file.read()
-            file.close();
-        else:
-            print >> debug_file, "No log file found for the glob"
-            log = None
-
-        (bug_open, bug_number) = bugzilla_find_bug_report(debug_file, server, args.copy(), bugname)
-        print >> debug_file, "Bug is open: %s and bug number: %s" % (bug_open, bug_number)
-
-        # The bug is present and still open, attach an error log
-        if not bug_number:
-            bug_number = bugzilla_file_bug(debug_file, server, args.copy(), bugname, text, version)
-            if not bug_number:
-                print >> debug_file, "Couldn't acquire a new bug_numer, filing a bugreport failed"
-            else:
-                print >> debug_file, "The new bug_number: '%s'" % bug_number
-        elif not bug_open:
-            if not bugzilla_reopen_bug(debug_file, server, args.copy(), bug_number):
-                print >> debug_file, "Failed to reopen the bug #%s" % bug_number
-            else:
-                print >> debug_file, "Reopened the bug #%s" % bug_number
-
-        if bug_number and log:
-            print >> debug_file, "The bug is known as '%s'" % bug_number
-            desc = "Build log for machine %s" % (bb.data.getVar('MACHINE', data, True))
-            if not bugzilla_create_attachment(debug_file, server, args.copy(), bug_number, text, log_file[0], log, desc):
-                 print >> debug_file, "Failed to attach the build log for bug #%s" % bug_number
-            else:
-                 print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, compon, bug_number)
-        else:
-            print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number
-            if not bugzilla_add_comment(debug_file, server, args.copy(), bug_number, text, ):
-                 print >> debug_file, "Failed to create a comment the build log for bug #%s" % bug_number
-            else:
-                 print >> debug_file, "Created an attachment for '%s' '%s' '%s'" % (product, compon, bug_number)
-
-        # store bug number for oestats-client
-        if bug_number:
-            bb.data.setVar('OESTATS_BUG_NUMBER', bug_number, data)
-}
-

meta/classes/buildstats.bbclass

@@ -48,27 +48,14 @@ def set_device(e):
     # something like stick DL_DIR on a different partition and this would
     # throw stats gathering off. The same goes with SSTATE_DIR. However, let's
     # get the basics in here and work on the cornercases later. 
-    # A note. /proc/diskstats does not contain info on encryptfs, tmpfs, etc.
-    # If we end up hitting one of these fs, we'll just skip diskstats collection.
     ############################################################################
     device=os.stat(tmpdir)
     majordev=os.major(device.st_dev)
     minordev=os.minor(device.st_dev)
-    ############################################################################
-    # Bug 1700: 
-    # Because tmpfs/encryptfs/ramfs etc inserts no entry in /proc/diskstats
-    # we set rdev to NoLogicalDevice and search for it later. If we find NLD
-    # we do not collect diskstats as the method to collect meaningful statistics
-    # for these fs types requires a bit more research. 
-    ############################################################################
-    rdev="NoLogicalDevice"
-    try:
-        for line in open("/proc/diskstats", "r"):
-            if majordev == int(line.split()[0]) and minordev == int(line.split()[1]):
-               rdev=line.split()[2]
-    except:
-        pass
-    file = open(e.data.getVar('DEVFILE', True), "w")
+    for line in open("/proc/diskstats", "r"):
+        if majordev == int(line.split()[0]) and minordev == int(line.split()[1]):
+           rdev=line.split()[2]
+    file = open(bb.data.getVar('DEVFILE', e.data, True), "w")
     file.write(rdev)
     file.close()
     
@@ -84,15 +71,12 @@ def get_diskstats(dev):
     # For info on what these are, see kernel doc file iostats.txt
     ############################################################################
     DSTAT_KEYS = ['ReadsComp', 'ReadsMerged', 'SectRead', 'TimeReads', 'WritesComp', 'SectWrite', 'TimeWrite', 'IOinProgress', 'TimeIO', 'WTimeIO']  
-    try:
-        for x in open("/proc/diskstats", "r"):
-            if dev in x:
-                diskstats_val = x.rstrip().split()[4:]
-    except IOError as e:
-        return
-    diskstats = dict(itertools.izip(DSTAT_KEYS, diskstats_val))
+    for x in open("/proc/diskstats", "r"):
+        if dev in x:
+            diskstats_val = x.rstrip().split()[4:]
+    diskstats = dict(itertools.izip(DSTAT_KEYS, diskstats_val))        
     return diskstats
-
+    
 def set_diskdata(var, dev, data):
     data.setVar(var, get_diskstats(dev))
 
@@ -149,11 +133,10 @@ def write_task_data(status, logfile, dev, e):
     # For the best information, running things with BB_TOTAL_THREADS = "1"
     # would return accurate per task results.
     ############################################################################
-    if dev != "NoLogicalDevice":
-        diskdata = get_diskdata("__diskdata_task", dev, e.data)
-        if diskdata:
-            for key in sorted(diskdata.iterkeys()):
-                file.write(key + ": " + diskdata[key] + "\n")
+    diskdata = get_diskdata("__diskdata_task", dev, e.data)
+    if diskdata:
+        for key in sorted(diskdata.iterkeys()):
+            file.write(key + ": " + diskdata[key] + "\n")
     if status is "passed":
 	    file.write("Status: PASSED \n")
     else:
@@ -186,8 +169,7 @@ python run_buildstats () {
             bb.mkdirhier(bsdir)
         except:
             pass
-        if device != "NoLogicalDevice":
-            set_diskdata("__diskdata_build", device, e.data)
+        set_diskdata("__diskdata_build", device, e.data)
         set_timedata("__timedata_build", e.data)
         build_time = os.path.join(bsdir, "build_stats")
         # write start of build into build_time
@@ -203,7 +185,7 @@ python run_buildstats () {
                 
     elif isinstance(e, bb.event.BuildCompleted):
         bn = get_bn(e)
-        device = get_device(e)
+        dev = get_device(e)
         bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
         taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
         build_time = os.path.join(bsdir, "build_stats")
@@ -219,11 +201,10 @@ python run_buildstats () {
             file.write("Elapsed time: %0.2f seconds \n" % (time))
             if cpu:
                 file.write("CPU usage: %0.1f%% \n" % cpu)
-        if device != "NoLogicalDevice":
-            diskio = get_diskdata("__diskdata_build", device, e.data)
-            if diskio:
-                for key in sorted(diskio.iterkeys()):
-                    file.write(key + ": " + diskio[key] + "\n")
+        diskio = get_diskdata("__diskdata_build", dev, e.data)
+        if diskio:
+            for key in sorted(diskio.iterkeys()):
+                file.write(key + ": " + diskio[key] + "\n")
         file.close()
 
     if isinstance(e, bb.build.TaskStarted):
@@ -231,8 +212,7 @@ python run_buildstats () {
         device = get_device(e)
         bsdir = os.path.join(bb.data.getVar('BUILDSTATS_BASE', e.data, True), bn)
         taskdir = os.path.join(bsdir, bb.data.expand("${PF}", e.data))
-        if device != "NoLogicalDevice":
-            set_diskdata("__diskdata_task", device, e.data)
+        set_diskdata("__diskdata_task", device, e.data)
         set_timedata("__timedata_task", e.data)
         try:
             bb.mkdirhier(taskdir)

meta/classes/crosssdk.bbclass

@@ -18,7 +18,6 @@ target_includedir = "${SDKPATHNATIVE}${includedir_nativesdk}"
 target_base_libdir = "${SDKPATHNATIVE}${base_libdir_nativesdk}"
 target_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
 target_exec_prefix = "${SDKPATHNATIVE}${exec_prefix_nativesdk}"
-baselib = "lib"
 
 do_populate_sysroot[stamp-extra-info] = ""
 do_package[stamp-extra-info] = ""

meta/classes/debian.bbclass

@@ -24,9 +24,6 @@ python debian_package_name_hook () {
 
 	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 	packages = bb.data.getVar('PACKAGES', d, 1)
-	bin_re = re.compile(".*/s?" + os.path.basename(d.getVar("bindir", True)) + "$")
-	lib_re = re.compile(".*/" + os.path.basename(d.getVar("libdir", True)) + "$")
-	so_re = re.compile("lib.*\.so")
 
 	def socrunch(s):
 		s = s.lower().replace('_', '-')
@@ -48,6 +45,9 @@ python debian_package_name_hook () {
 		return (s[stat.ST_MODE] & stat.S_IEXEC)
 
 	def auto_libname(packages, orig_pkg):
+		bin_re = re.compile(".*/s?bin$")
+		lib_re = re.compile(".*/lib$")
+		so_re = re.compile("lib.*\.so")
 		sonames = []
 		has_bins = 0
 		has_libs = 0
@@ -104,10 +104,6 @@ python debian_package_name_hook () {
 						newpkg = pkgname
 					else:
 						newpkg = pkg.replace(orig_pkg, devname, 1)
-					mlpre=bb.data.getVar('MLPREFIX', d, True)
-					if mlpre:
-						if not newpkg.find(mlpre) == 0:
-							newpkg = mlpre + newpkg
 					if newpkg != pkg:
 						bb.data.setVar('PKG_' + pkg, newpkg, d)
 

meta/classes/distrodata.bbclass

@@ -8,7 +8,7 @@ python distro_eventhandler() {
 	logfile = dc.create_log_file(e.data, "distrodata.csv")
 	lf = bb.utils.lockfile("%s.lock" % logfile)
 	f = open(logfile, "a")
-	f.write("Package,Description,Owner,License,ChkSum,Status,VerMatch,Version,Upsteam,Non-Update,Reason,Recipe Status,Distro 1,Distro 2,Distro 3\n")
+	f.write("Package,Description,Owner,License,ChkSum,Status,VerMatch,Version,Upsteam,Non-Update,Reason,Recipe Status\n")
         f.close()
         bb.utils.unlockfile(lf)
 
@@ -34,24 +34,12 @@ python do_distrodata_np() {
 	    bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
 	    bb.data.update_data(localdata)
 
-	if pn.find("-nativesdk") != -1:
-	    pnstripped = pn.split("-nativesdk")
-	    bb.note("Native Split: %s" % pnstripped)
-	    bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
-	    bb.data.update_data(localdata)
-
 	if pn.find("-cross") != -1:
 	    pnstripped = pn.split("-cross")
 	    bb.note("cross Split: %s" % pnstripped)
 	    bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
 	    bb.data.update_data(localdata)
 
-	if pn.find("-crosssdk") != -1:
-	    pnstripped = pn.split("-crosssdk")
-	    bb.note("cross Split: %s" % pnstripped)
-	    bb.data.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + bb.data.getVar('OVERRIDES', d, True), localdata)
-	    bb.data.update_data(localdata)
-
 	if pn.find("-initial") != -1:
 	    pnstripped = pn.split("-initial")
 	    bb.note("initial Split: %s" % pnstripped)
@@ -193,7 +181,7 @@ python do_distrodata() {
 
 	lf = bb.utils.lockfile("%s.lock" % logfile)
 	f = open(logfile, "a")
-	f.write("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s" % \
+	f.write("%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s," % \
 		  (pname, pdesc, maintainer, plicense, pchksum, hasrstatus, vermatch, pcurver, pupver, noupdate, noupdate_reason, rstatus))
         line = ""
         for i in result:
@@ -683,9 +671,6 @@ python do_distro_check() {
     import oe.distro_check as dc
     import bb
     import shutil
-    if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk',d):
-        return
-
     localdata = bb.data.createCopy(d)
     bb.data.update_data(localdata)
     tmpdir = bb.data.getVar('TMPDIR', d, True)

meta/classes/distutils.bbclass

@@ -72,5 +72,3 @@ distutils_do_install() {
 }
 
 EXPORT_FUNCTIONS do_compile do_install
-
-export LDSHARED="${CCLD} -shared"

meta/classes/icecc.bbclass

@@ -26,191 +26,295 @@
 #Error checking is kept to minimum so double check any parameters you pass to the class
 ###########################################################################################
 
-ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
 
-def icecc_dep_prepend(d):
-    # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command.  Whether or  not
-    # we need that built is the responsibility of the patch function / class, not
-    # the application.
-    if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d):
-        return "icecc-create-env-native"
-    return ""
+def icc_determine_gcc_version(gcc):
+    """
+    Hack to determine the version of GCC
 
-DEPENDS_prepend += "${@icecc_dep_prepend(d)} "
+    'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)'
+    """
+    return os.popen("%s --version" % gcc ).readline().split()[2]
 
-def get_cross_kernel_cc(bb,d):
+def create_cross_env(bb,d):
+    """
+    Create a tar.bz2 of the current toolchain
+    """
+    # Constin native-native compilation no environment needed if
+    # host prefix is empty (let us duplicate the query for ease)
+    prefix = bb.data.expand('${HOST_PREFIX}', d)
+    if len(prefix) == 0:
+        return ""
+
+    import tarfile, socket, time
+    prefix  = bb.data.expand('${HOST_PREFIX}' , d)
+    ice_dir = bb.data.expand("${STAGING_DIR_NATIVE}${prefix_native}")
+    distro  = bb.data.expand('${DISTRO}', d)
+    target_sys = bb.data.expand('${TARGET_SYS}',  d)
+    target_prefix = bb.data.expand('${TARGET_PREFIX}',  d)
+    float   = bb.data.getVar('TARGET_FPU', d) or "hard"
+    name    = socket.gethostname()
+
+    # Stupid check to determine if we have built a libc and a cross
+    # compiler.
+    try:
+        os.stat(os.path.join(ice_dir, target_sys, 'lib', 'libc.so'))
+        os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++'))
+    except: # no cross compiler built yet
+        return ""
+
+    VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") )
+    cross_name = prefix + distro + "-" + target_sys + "-" + float + "-" + VERSION + "-" + name
+    tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.gz')
+
+    try:
+        os.stat(tar_file)
+	# tar file already exists
+        return tar_file
+    except: 
+        try:
+            os.makedirs(os.path.join(ice_dir,'ice'))
+        except:
+            # directory already exists, continue
+            pass
+
+
+    #check if user has specified a specific icecc-create-env script
+    #if not use the OE provided one
+    cr_env_script = bb.data.getVar('ICECC_ENV_EXEC',  d) or  bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env"
+    #call the modified create-env script
+    result=os.popen("%s %s %s %s %s %s" %(cr_env_script,
+           "--silent",
+           os.path.join(ice_dir,target_sys,'bin','gcc'),
+           os.path.join(ice_dir,target_sys,'bin','g++'),
+           os.path.join(ice_dir,target_sys,'bin','as'),
+           os.path.join(ice_dir,"ice",cross_name) ) )
+    return tar_file
+
+
+def create_native_env(bb,d):
+    import tarfile, socket, time
+    ice_dir = bb.data.expand("${STAGING_DIR_NATIVE}${prefix_native}")
+    prefix  = bb.data.expand('${HOST_PREFIX}' , d)
+    distro  = bb.data.expand('${DISTRO}', d)
+    target_sys = bb.data.expand('${TARGET_SYS}',  d)
+    target_prefix = bb.data.expand('${TARGET_PREFIX}',  d)
+    float   = bb.data.getVar('TARGET_FPU', d) or "hard"
+    name    = socket.gethostname()
+
+    archive_name = "local-host-env" + "-" + name
+    tar_file = os.path.join(ice_dir, 'ice', archive_name + '.tar.gz')
+
+    try:
+        os.stat(tar_file)
+	# tar file already exists
+        return tar_file
+    except: 
+        try:
+            #os.makedirs(os.path.join(ice_dir))
+            os.makedirs(os.path.join(ice_dir,'ice'))
+        except:
+            # directory already exists, continue
+            pass
+
+    #check if user has specified a specific icecc-create-env script
+    #if not use the OE provided one
+    cr_env_script = bb.data.getVar('ICECC_ENV_EXEC',  d) or  bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env"
+    result=os.popen("%s %s %s %s %s %s" %(cr_env_script,
+           "--silent",
+           os.popen("%s gcc" % "which").read()[:-1],
+           os.popen("%s g++" % "which").read()[:-1],
+           os.popen("%s as" % "which").read()[:-1],
+           os.path.join(ice_dir,"ice",archive_name) ) )
+    return tar_file
+
+
+
+def create_cross_kernel_env(bb,d):
+    import tarfile, socket, time
+    ice_dir = bb.data.expand("${STAGING_DIR_NATIVE}${prefix_native}")
+    prefix  = bb.data.expand('${HOST_PREFIX}' , d)
+    distro  = bb.data.expand('${DISTRO}', d)
+    target_sys = bb.data.expand('${TARGET_SYS}',  d)
+    target_prefix = bb.data.expand('${TARGET_PREFIX}',  d)
+    float   = bb.data.getVar('TARGET_FPU', d) or "hard"
+    name    = socket.gethostname()
     kernel_cc = bb.data.expand('${KERNEL_CC}', d)
-    kernel_cc = kernel_cc.replace('ccache', '').strip()
-    kernel_cc = kernel_cc.split(' ')[0]
-    kernel_cc = kernel_cc.strip()
-    return kernel_cc
+    kernel_cc = kernel_cc[:-1]
 
-def create_path(compilers, bb, d):
+    # Stupid check to determine if we have built a libc and a cross
+    # compiler.
+    try:
+       os.stat(os.path.join(ice_dir, 'bin', kernel_cc))
+    except: # no cross compiler built yet
+        return ""
+
+    VERSION = icc_determine_gcc_version( os.path.join(ice_dir,"bin",kernel_cc) )
+    cross_name = prefix + distro + "-" + target_sys + "-" + float + "-" + VERSION + "-" + name
+    tar_file = os.path.join(ice_dir, 'ice', cross_name + '.tar.gz')
+
+    try:
+        os.stat(tar_file)
+	# tar file already exists
+        return tar_file
+    except: 
+        try:
+            os.makedirs(os.path.join(ice_dir,'ice'))
+        except:
+            # directory already exists, continue
+            pass
+
+
+    #check if user has specified a specific icecc-create-env script
+    #if not use the OE provided one
+    cr_env_script = bb.data.getVar('ICECC_ENV_EXEC',  d) or  bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env"
+    result=os.popen("%s %s %s %s %s %s" %(cr_env_script,
+           "--silent",
+           os.path.join(ice_dir,'bin',kernel_cc),
+           os.path.join(ice_dir,target_sys,'bin','g++'),
+           os.path.join(ice_dir,target_sys,'bin','as'),
+           os.path.join(ice_dir,"ice",cross_name) ) )
+    return tar_file
+
+
+def create_env(bb,d):
+
+        #return create_cross_kernel_env(bb,d) 
+
+        if bb.data.inherits_class("native", d):
+          return create_native_env(bb,d)
+        elif bb.data.inherits_class("kernel", d):
+          return create_cross_kernel_env(bb,d)
+        elif bb.data.inherits_class("cross", d):
+          return create_native_env(bb,d)
+        elif bb.data.inherits_class("sdk", d):
+          return create_native_env(bb,d)
+        else:  
+          return create_cross_env(bb,d)
+
+
+def create_path(compilers, type, bb, d):
     """
     Create Symlinks for the icecc in the staging directory
     """
-    staging = os.path.join(bb.data.expand('${STAGING_BINDIR}', d), "ice")
-    if icc_is_kernel(bb, d):
-        staging += "-kernel"
+    staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type)
 
     #check if the icecc path is set by the user
-    icecc   = bb.data.getVar('ICECC_PATH', d) or os.popen("which icecc").read()[:-1]
+    icecc   = bb.data.getVar('ICECC_PATH', d) or os.popen("%s icecc" % "which").read()[:-1]
 
     # Create the dir if necessary
     try:
         os.stat(staging)
     except:
-        try:
-            os.makedirs(staging)
-        except:
-            pass
+        os.makedirs(staging)
 
     for compiler in compilers:
         gcc_path = os.path.join(staging, compiler)
         try:
             os.stat(gcc_path)
         except:
-            try:
-                os.symlink(icecc, gcc_path)
-            except:
-                pass
+            os.symlink(icecc, gcc_path)
 
-    return staging
+    return staging + ":"
 
-def use_icc(bb,d):
+
+def use_icc_version(bb,d):
+      icecc_ver = "yes"
+      system_class_blacklist = [ "none" ] 
+
+      for black in system_class_blacklist:
+           if bb.data.inherits_class(black, d):
+              icecc_ver = "no"
+
+      user_class_blacklist =  bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none"
+      user_class_blacklist = user_class_blacklist.split()
+
+      for black in user_class_blacklist:
+           if bb.data.inherits_class(black, d):
+              icecc_ver = "no"
+
+      return icecc_ver
+
+
+def icc_path(bb,d,compile):
     package_tmp = bb.data.expand('${PN}', d)
 
-    system_class_blacklist = [ "none" ] 
-    user_class_blacklist = (bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none").split()
-    package_class_blacklist = system_class_blacklist + user_class_blacklist
-
-    for black in package_class_blacklist:
-        if bb.data.inherits_class(black, d):
-            #bb.note(package_tmp, ' class ', black, ' found in blacklist, disable icecc')
-            return "no"
-
     #"system" package blacklist contains a list of packages that can not distribute compile tasks
     #for one reason or the other
-    system_package_blacklist = [ "uclibc", "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman", "orbit2" ]
-    user_package_blacklist = (bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "").split()
-    package_blacklist = system_package_blacklist + user_package_blacklist
+    system_package_blacklist = [ "uclibc", "glibc-intermediate", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ]
 
-    for black in package_blacklist:
-        if black in package_tmp:
-            #bb.note(package_tmp, ' found in blacklist, disable icecc')
-            return "no"
+    for black in system_package_blacklist:
+      if black in package_tmp:
+         bb.data.setVar("PARALLEL_MAKE" , "", d) 
+         return ""
 
-    if bb.data.getVar('PARALLEL_MAKE', d) == "":
-        bb.note(package_tmp, " ", bb.data.expand('${PV}', d), " has empty PARALLEL_MAKE, disable icecc")
-        return "no"
+    #user defined exclusion list
+    user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "none"   
+    user_package_blacklist = user_package_blacklist.split()
 
-    return "yes"
+    for black in user_package_blacklist:
+      if black in package_tmp:
+         bb.data.setVar("PARALLEL_MAKE" , "", d) 
+         return ""
 
-def icc_is_kernel(bb, d):
-    return \
-        bb.data.inherits_class("kernel", d);
 
-def icc_is_native(bb, d):
-    return \
-        bb.data.inherits_class("cross", d) or \
-        bb.data.inherits_class("native", d);
+    prefix = bb.data.expand('${HOST_PREFIX}', d)
 
-def icc_version(bb, d):
-    if use_icc(bb, d) == "no":
-        return ""
+            
+    if compile and bb.data.inherits_class("cross", d):
+       return create_path( ["gcc", "g++"], "native", bb, d)
 
-    parallel = bb.data.getVar('ICECC_PARALLEL_MAKE', d) or ""
-    bb.data.setVar("PARALLEL_MAKE", parallel, d)
+    elif compile and bb.data.inherits_class("native", d):
+         return create_path( ["gcc", "g++"], "native", bb, d)
 
-    if icc_is_native(bb, d):
-        archive_name = "local-host-env"
-    elif bb.data.expand('${HOST_PREFIX}', d) == "":
-        bb.fatal(bb.data.expand("${PN}", d), " NULL prefix")
-    else:
-        prefix = bb.data.expand('${HOST_PREFIX}' , d)
-        distro = bb.data.expand('${DISTRO}', d)
-        target_sys = bb.data.expand('${TARGET_SYS}', d)
-        float = bb.data.getVar('TARGET_FPU', d) or "hard"
-        archive_name = prefix + distro + "-"        + target_sys + "-" + float
-        if icc_is_kernel(bb, d):
-            archive_name += "-kernel"
+    elif compile and bb.data.inherits_class("kernel", d):
+          return create_path( [get_cross_kernel_ver(bb,d), "foo"], "cross-kernel", bb, d)
 
-    import socket
-    ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}', d)
-    tar_file = os.path.join(ice_dir, 'ice', archive_name + "-@VERSION@-" + socket.gethostname() + '.tar.gz')
-
-    return tar_file
-
-def icc_path(bb,d):
-    if icc_is_kernel(bb, d):
-        return create_path( [get_cross_kernel_cc(bb,d), ], bb, d)
+    elif not compile or len(prefix) == 0:
+           return create_path( ["gcc", "g++"], "native", bb, d)
 
     else:
-        prefix = bb.data.expand('${HOST_PREFIX}', d)
-        return create_path( [prefix+"gcc", prefix+"g++"], bb, d)      
+           return create_path( [prefix+"gcc", prefix+"g++"], "cross", bb, d)      
 
-def icc_get_tool(bb, d, tool):
-    if icc_is_native(bb, d):
-        return os.popen("which %s" % tool).read()[:-1]
-    elif icc_is_kernel(bb, d):
-        return os.popen("which %s" % get_cross_kernel_cc(bb, d)).read()[:-1]
-    else:
-        ice_dir = bb.data.expand('${STAGING_BINDIR_TOOLCHAIN}', d)
-        target_sys = bb.data.expand('${TARGET_SYS}',  d)
-        return os.path.join(ice_dir, "%s-%s" % (target_sys, tool))
 
-set_icecc_env() {
-    ICECC_VERSION="${@icc_version(bb, d)}"
-    if [ "x${ICECC_VERSION}" = "x" ]
-    then
-        return
-    fi
 
-    ICE_PATH="${@icc_path(bb, d)}"
-    if [ "x${ICE_PATH}" = "x" ]
-    then
-        return
-    fi
 
-    ICECC_CC="${@icc_get_tool(bb,d, "gcc")}"
-    ICECC_CXX="${@icc_get_tool(bb,d, "g++")}"
-    if [ ! -x "${ICECC_CC}" -o ! -x "${ICECC_CXX}" ]
-    then
-        return
-    fi
+def icc_version(bb,d):
+    return create_env(bb,d)
 
-    ICE_VERSION=`$ICECC_CC -dumpversion`
-    ICECC_VERSION=`echo ${ICECC_VERSION} | sed -e "s/@VERSION@/$ICE_VERSION/g"`
-    if [ ! -x "${ICECC_ENV_EXEC}" ]
-    then
-        return
-    fi
 
-    ICECC_AS="`${ICECC_CC} -print-prog-name=as`"
-    if [ "`dirname "${ICECC_AS}"`" = "." ]
-    then
-        ICECC_AS="`which as`"
-    fi
+def check_for_kernel(bb,d):     
+    if  bb.data.inherits_class("kernel", d):
+         return "yes"
+    return "no"
 
-    if [ ! -r "${ICECC_VERSION}" ]
-    then
-        mkdir -p "`dirname "${ICECC_VERSION}"`"
-        ${ICECC_ENV_EXEC} "${ICECC_CC}" "${ICECC_CXX}" "${ICECC_AS}" "${ICECC_VERSION}"
-    fi
 
-    export ICECC_VERSION ICECC_CC ICECC_CXX
-    export PATH="$ICE_PATH:$PATH"
-    export CCACHE_PATH="$PATH"
-}
+def get_cross_kernel_ver(bb,d):
 
+       return  bb.data.expand('${KERNEL_CC}', d).strip() or "gcc"
+
+# set the icecream environment variables
 do_configure_prepend() {
-    set_icecc_env
+    export PATH=${@icc_path(bb,d,False)}$PATH
+    export ICECC_CC="gcc"
+    export ICECC_CXX="g++"
 }
 
 do_compile_prepend() {
-    set_icecc_env
-}
 
-#do_install_prepend() {
-#    set_icecc_env
-#}
+    export PATH=${@icc_path(bb,d,True)}$PATH
+ 
+ #check if we are building a kernel and select gcc-cross-kernel
+ if [ "${@check_for_kernel(bb,d)}" = "yes" ]; then
+    export ICECC_CC="${@get_cross_kernel_ver(bb,d)}"
+    export ICECC_CXX="${HOST_PREFIX}g++"
+ else
+    export ICECC_CC="${HOST_PREFIX}gcc"
+    export ICECC_CXX="${HOST_PREFIX}g++"
+ fi
+
+    if [ "${@use_icc_version(bb,d)}" = "yes" ]; then
+        export ICECC_VERSION="${@icc_version(bb,d)}"
+    else
+        export ICECC_VERSION="NONE"
+    fi
+}

meta/classes/image.bbclass

@@ -5,7 +5,8 @@ inherit imagetest-${IMAGETEST}
 
 LICENSE = "MIT"
 PACKAGES = ""
-RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL}"
+MULTILIB_IMAGE_INSTALL ?= ""
+RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${MULTILIB_IMAGE_INSTALL} ${NORMAL_FEATURE_INSTALL}"
 RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}"
 
 INHIBIT_DEFAULT_DEPS = "1"
@@ -53,6 +54,7 @@ IMAGE_INSTALL ?= ""
 IMAGE_INSTALL[type] = "list"
 IMAGE_BASENAME[export] = "1"
 export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${FEATURE_INSTALL}"
+export MULTILIB_PACKAGE_INSTALL ?= "${MULTILIB_IMAGE_INSTALL}"
 PACKAGE_INSTALL_ATTEMPTONLY ?= "${FEATURE_INSTALL_OPTIONAL}"
 
 # Images are generally built explicitly, do not need to be part of world.
@@ -76,8 +78,6 @@ inherit image-${IMAGE_TYPE}
 python () {
     deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
     for type in (bb.data.getVar('IMAGE_FSTYPES', d, True) or "").split():
-        if type == "live":
-            type = "ext3"
         for dep in ((bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "").split() or []):
             deps += " %s:do_populate_sysroot" % dep
     for dep in (bb.data.getVar('EXTRA_IMAGEDEPENDS', d, True) or "").split():
@@ -213,6 +213,7 @@ log_check() {
 }
 
 MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|"
+MULTILIBRE_FORCE_SAME =. "${sysconfdir}|${datadir}|"
 MULTILIB_CHECK_FILE = "${WORKDIR}/multilib_check.py"
 MULTILIB_TEMP_ROOTFS = "${WORKDIR}/multilib"
 
@@ -222,6 +223,7 @@ import sys, os, os.path
 import re,filecmp
 
 allow_rep=re.compile(re.sub("\|$","","${MULTILIBRE_ALLOW_REP}"))
+force_same=re.compile(re.sub("\|$","","${MULTILIBRE_FORCE_SAME}"))
 error_promt="Multilib check error:"
 
 files={}
@@ -234,14 +236,19 @@ for dir in dirs.split():
 
       valid=True;
       if files.has_key(key):
-        #check whether the file is allow to replace
-        if allow_rep.match(key):
-          valid=True
-        else:
+        #check whether files are the same
+        if force_same.match(key):
           if not filecmp.cmp(files[key],item):
              valid=False
-             print("%s duplicate files %s %s is not the same\n" % (error_promt, item, files[key]))
+             print("%s %s is not the same as %s\n" % (error_promt, item, files[key]))
              sys.exit(1)
+        #check whether the file is allow to replace
+        elif allow_rep.match(key):
+          valid=True
+        else: 
+          valid=False
+          print("%s duplicated files %s %s not allowed\n" % (error_promt, item, files[key]))
+          sys.exit(1)
 
       #pass the check, add to list
       if valid:

meta/classes/image_types.bbclass

@@ -38,22 +38,22 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLO
 
 IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
 
-IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
+IMAGE_CMD_ext2 = "genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
 IMAGE_CMD_ext2.gz () {
 	rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
-	genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
+	genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
 	gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2
 	mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
 	rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
 }
 
 IMAGE_CMD_ext3 () {
-	genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
+	genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
 	tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
 }
 IMAGE_CMD_ext3.gz () {
 	rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN} && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}
-	genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
+	genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
 	tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
 	gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3
 	mv ${DEPLOY_DIR_IMAGE}/tmp.gz-${PN}/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz
@@ -61,7 +61,7 @@ IMAGE_CMD_ext3.gz () {
 }
 
 oe_mkext4fs () {
-	genext2fs -b $ROOTFS_SIZE -i 4096 -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1
+	genext2fs -b $ROOTFS_SIZE -d ${IMAGE_ROOTFS} ${EXTRA_IMAGECMD} $1
 	tune2fs -O extents,uninit_bg,dir_index,has_journal $1
 	e2fsck -yfDC0 $1 || chk=$?
 	case $chk in
@@ -111,7 +111,7 @@ IMAGE_CMD_ubi () {
 	echo vol_flags=autoresize >> ubinize.cfg
 	mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS} && ubinize -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi ${UBINIZE_ARGS} ubinize.cfg
 }
-IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}"
+IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.ubifs.img ${MKUBIFS_ARGS}"
 
 EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 ?= "--pad --little-endian --eraseblock=0x40000"

meta/classes/imagetest-qemu.bbclass

@@ -70,7 +70,7 @@ def qemuimagetest_main(d):
         os.environ["DISPLAY"] = bb.data.getVar("DISPLAY", d, True)
         os.environ["COREBASE"] = bb.data.getVar("COREBASE", d, True)
         os.environ["TOPDIR"] = bb.data.getVar("TOPDIR", d, True)
-        os.environ["OE_TMPDIR"] = bb.data.getVar("TMPDIR", d, True)
+        os.environ["TMPDIR"] = bb.data.getVar("TMPDIR", d, True)
         os.environ["TEST_STATUS"] = bb.data.getVar("TEST_STATUS", d, True)
         os.environ["TARGET_IPSAVE"] = bb.data.getVar("TARGET_IPSAVE", d, True)
         os.environ["TEST_SERIALIZE"] = bb.data.getVar("TEST_SERIALIZE", d, True)
@@ -80,31 +80,9 @@ def qemuimagetest_main(d):
         bb.note("Run %s test in scenario %s" % (case, scen))
         os.system("%s" % fulltestpath)
     
-    """function to check testcase list and remove inappropriate cases"""
-    def check_list(list):
-	final_list = []
-	for test in list:
-	    (scen, case, fullpath) = test
-
-	    """Skip rpm/zypper if package_rpm not set for PACKAGE_CLASSES"""
-	    if case.find("zypper") != -1 or case.find("rpm") != -1:
-	        if d.getVar("PACKAGE_CLASSES", True).find("rpm", 0, 11) == -1:
-            	    bb.note("skip rpm/zypper cases since package_rpm not set in PACKAGE_CLASSES")
-	 	    continue
-	        else:
-		    final_list.append((scen, case, fullpath))
-	    else:
-                    final_list.append((scen, case, fullpath))
-
-	if not final_list:
-	    raise bb.build.FuncFailed("There is no suitable testcase for this target")
-
-	return final_list
-
     """Generate testcase list in runtime"""
     def generate_list(testlist):
         list = []
-	final_list = []
         if len(testlist) == 0:
             raise bb.build.FuncFailed("No testcase defined in TEST_SCEN")
 
@@ -136,8 +114,7 @@ def qemuimagetest_main(d):
                        if not os.path.isfile(fulltestcase):
                             raise bb.build.FuncFailed("Testcase %s not found" % fulltestcase)
                        list.append((item, casefile, fulltestcase))
-	final_list = check_list(list)
-        return final_list
+        return list
 
     """Clean tmp folder for testing"""
     def clean_tmp():

meta/classes/insane.bbclass

@@ -179,8 +179,8 @@ def package_qa_check_dev(path, name, d, elf, messages):
     Check for ".so" library symlinks in non-dev packages
     """
 
-    if not name.endswith("-dev") and not name.endswith("-dbg") and not name.endswith("-nativesdk") and path.endswith(".so") and os.path.islink(path):
-        messages.append("non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s'" % \
+    if not name.endswith("-dev") and not name.endswith("-dbg") and path.endswith(".so") and os.path.islink(path):
+        messages.append("non -dev/-dbg package contains symlink .so: %s path '%s'" % \
                  (name, package_qa_clean_path(path,d)))
 
 QAPATHTEST[debug-files] = "package_qa_check_dbg"