ref-manual: Corrected the "package_rpm.bbclass" section.

A cut-and-paste error had left a "package_deb" string in the
first sentence of the section.  Replaced with "package_rpm."

Reported-by: Geoffroy VanCutsem <geoffroy.vancutsem@intel.com>
(From yocto-docs rev: 8eb1ef532754def5d1d15b98b3b45f259af0edc0)

Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bitbake/LICENSE

@@ -1,10 +0,0 @@
-BitBake is licensed under the GNU General Public License version 2.0. See COPYING for further details.
-
-The following external components are distributed with this software:
-
-* The Toaster Simple UI application is based upon the Django project template, the files of which are covered by the BSD license and are copyright (c) Django Software
-Foundation and individual contributors.
-
-* Twitter Bootstrap (including Glyphicons), redistributed under the Apache License 2.0.
-
-* jQuery is redistributed under the MIT license.

bitbake/bin/bitbake

@@ -41,7 +41,7 @@ from bb import ui
 from bb import server
 from bb import cookerdata
 
-__version__ = "1.21.0"
+__version__ = "1.20.0"
 logger = logging.getLogger("BitBake")
 
 # Python multiprocessing requires /dev/shm
@@ -190,9 +190,6 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters):
         parser.add_option("", "--observe-only", help = "Connect to a server as an observing-only client.",
                    action = "store_true", dest = "observe_only", default = False)
 
-        parser.add_option("", "--status-only", help = "Check the status of the remote bitbake server.",
-                   action = "store_true", dest = "status_only", default = False)
-
         options, targets = parser.parse_args(sys.argv)
 
         # some environmental variables set also configuration options
@@ -208,10 +205,8 @@ def start_server(servermodule, configParams, configuration):
     if configParams.bind:
         (host, port) = configParams.bind.split(':')
         server.initServer((host, int(port)))
-        configuration.interface = [ server.serverImpl.host, server.serverImpl.port ]
     else:
         server.initServer()
-        configuration.interface = []
 
     try:
         configuration.setServerRegIdleCallback(server.getServerIdleCB())
@@ -289,9 +284,7 @@ def main():
 
     # Ensure logging messages get sent to the UI as events
     handler = bb.event.LogHandler()
-    if not configParams.status_only:
-        # In status only mode there are no logs and no UI
-        logger.addHandler(handler)
+    logger.addHandler(handler)
 
     # Clear away any spurious environment variables while we stoke up the cooker
     cleanedvars = bb.utils.clean_environment()
@@ -304,31 +297,13 @@ def main():
         # we start a stub server that is actually a XMLRPClient that connects to a real server
         server = servermodule.BitBakeXMLRPCClient(configParams.observe_only)
         server.saveConnectionDetails(configParams.remote_server)
-        server.saveConnectionConfigParams(configParams)
 
     if not configParams.server_only:
         # Collect the feature set for the UI
         featureset = getattr(ui_module, "featureSet", [])
 
-        if configParams.status_only:
-            try:
-                server_connection = server.establishConnection(featureset)
-            except:
-                sys.exit(1)
-            if not server_connection:
-                sys.exit(1)
-            server_connection.terminate()
-            sys.exit(0)
-
         # Setup a connection to the server (cooker)
         server_connection = server.establishConnection(featureset)
-        if not server_connection:
-            if configParams.kill_server:
-                bb.fatal("Server already killed")
-            configParams.bind = configParams.remote_server
-            start_server(servermodule, configParams, configuration)
-            bb.event.ui_queue = []
-            server_connection = server.establishConnection(featureset)
 
         # Restore the environment in case the UI needs it
         for k in cleanedvars:

bitbake/bin/bitbake-layers

@@ -55,16 +55,10 @@ def main(args):
 
 class Commands(cmd.Cmd):
     def __init__(self):
-        self.bbhandler = None
-        self.returncode = 0
-        self.bblayers = []
         cmd.Cmd.__init__(self)
-
-    def init_bbhandler(self, config_only = False):
-        if not self.bbhandler:
-            self.bbhandler = bb.tinfoil.Tinfoil()
-            self.bblayers = (self.bbhandler.config_data.getVar('BBLAYERS', True) or "").split()
-            self.bbhandler.prepare(config_only)
+        self.bbhandler = bb.tinfoil.Tinfoil()
+        self.returncode = 0
+        self.bblayers = (self.bbhandler.config_data.getVar('BBLAYERS', True) or "").split()
 
     def default(self, line):
         """Handle unrecognised commands"""
@@ -89,7 +83,7 @@ class Commands(cmd.Cmd):
 
     def do_show_layers(self, args):
         """show current configured layers"""
-        self.init_bbhandler(config_only = True)
+        self.bbhandler.prepare(config_only = True)
         logger.plain("%s  %s  %s" % ("layer".ljust(20), "path".ljust(40), "priority"))
         logger.plain('=' * 74)
         for layerdir in self.bblayers:
@@ -126,7 +120,7 @@ Options:
        recipes with the ones they overlay indented underneath
   -s   only list overlayed recipes where the version is the same
 """
-        self.init_bbhandler()
+        self.bbhandler.prepare()
 
         show_filenames = False
         show_same_ver_only = False
@@ -209,7 +203,7 @@ Options:
   -m   only list where multiple recipes (in the same layer or different
        layers) exist for the same recipe name
 """
-        self.init_bbhandler()
+        self.bbhandler.prepare()
 
         show_filenames = False
         show_multi_provider_only = False
@@ -347,7 +341,7 @@ build results (as the layer priority order has effectively changed).
             logger.error('Directory %s exists and is non-empty, please clear it out first' % outputdir)
             return
 
-        self.init_bbhandler()
+        self.bbhandler.prepare()
         layers = self.bblayers
         if len(arglist) > 2:
             layernames = arglist[:-1]
@@ -503,7 +497,7 @@ usage: show-appends
 
 Recipes are listed with the bbappends that apply to them as subitems.
 """
-        self.init_bbhandler()
+        self.bbhandler.prepare()
         if not self.bbhandler.cooker.collection.appendlist:
             logger.plain('No append files found')
             return
@@ -576,7 +570,7 @@ Options:
 NOTE:
 The .bbappend file can impact the dependency.
 """
-        self.init_bbhandler()
+        self.bbhandler.prepare()
 
         show_filenames = False
         for arg in args.split():

bitbake/bin/bitbake-worker

@@ -81,7 +81,7 @@ def workerlog_write(msg):
         lf.write(msg)
         lf.flush()
 
-def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdata, quieterrors=False):
+def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, quieterrors=False):
     # We need to setup the environment BEFORE the fork, since
     # a fork() or exec*() activates PSEUDO...
 
@@ -148,7 +148,6 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, taskdepdat
                 os.umask(umask)
 
             data.setVar("BB_WORKERCONTEXT", "1")
-            data.setVar("BB_TASKDEPDATA", taskdepdata)
             data.setVar("BUILDNAME", workerdata["buildname"])
             data.setVar("DATE", workerdata["date"])
             data.setVar("TIME", workerdata["time"])
@@ -301,10 +300,10 @@ class BitbakeWorker(object):
         sys.exit(0)
 
     def handle_runtask(self, data):
-        fn, task, taskname, quieterrors, appends, taskdepdata = pickle.loads(data)
+        fn, task, taskname, quieterrors, appends = pickle.loads(data)
         workerlog_write("Handling runtask %s %s %s\n" % (task, fn, taskname))
 
-        pid, pipein, pipeout = fork_off_task(self.cookercfg, self.data, self.workerdata, fn, task, taskname, appends, taskdepdata, quieterrors)
+        pid, pipein, pipeout = fork_off_task(self.cookercfg, self.data, self.workerdata, fn, task, taskname, appends, quieterrors)
 
         self.build_pids[pid] = task
         self.build_pipes[pid] = runQueueWorkerPipe(pipein, pipeout)

bitbake/bin/toaster

@@ -1,164 +0,0 @@
-#!/bin/bash
-# (c) 2013 Intel Corp.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-# This script enables toaster event logging and
-# starts bitbake resident server
-# use as:  source toaster [start|stop]
-
-# Helper function to kill a background toaster development server
-
-function webserverKillAll()
-{
-	local pidfile
-	for pidfile in ${BUILDDIR}/.toastermain.pid; do
-		if [ -f ${pidfile} ]; then
-		while kill -0 $(< ${pidfile}) 2>/dev/null; do
-			kill -SIGTERM -$(< ${pidfile}) 2>/dev/null
-			sleep 1;
-		done;
-		rm  ${pidfile}
-		fi
-	done
-}
-
-function webserverStartAll()
-{
-        retval=0
-        python $BBBASEDIR/lib/toaster/manage.py syncdb || retval=1
-        if [ $retval -eq 1 ]; then
-                echo "Failed db sync, stopping system start" 1>&2
-        else
-            python $BBBASEDIR/lib/toaster/manage.py runserver 0.0.0.0:8000 </dev/null >${BUILDDIR}/toaster_web.log 2>&1 & echo $! >${BUILDDIR}/.toastermain.pid
-        fi
-        return $retval
-}
-
-# Helper functions to add a special configuration file
-
-function addtoConfiguration()
-{
-        echo "#Created by toaster start script" > ${BUILDDIR}/conf/$2
-        echo $1 >> ${BUILDDIR}/conf/$2
-}
-
-# define the stop command
-function stop_system()
-{
-    if [ -f ${BUILDDIR}/.toasterui.pid ]; then
-        kill $(< ${BUILDDIR}/.toasterui.pid )
-        rm ${BUILDDIR}/.toasterui.pid
-    fi
-    BBSERVER=localhost:8200 bitbake -m
-    unset BBSERVER
-    webserverKillAll
-    # force stop any misbehaving bitbake server
-    lsof bitbake.lock | awk '{print $2}' | grep "[0-9]\+" | xargs -n1 -r kill
-}
-
-# We make sure we're running in the current shell and in a good environment
-
-if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; then
-    echo "Error: This script needs to be sourced. Please run as 'source toaster [start|stop]'" 1>&2;
-    exit 1
-fi
-
-if [ -z "$BUILDDIR" ] || [ -z `which bitbake` ]; then
-    echo "Error: Build environment is not setup or bitbake is not in path." 1>&2;
-    return 2
-fi
-
-BBBASEDIR=`dirname ${BASH_SOURCE}`/..
-
-
-# Verify prerequisites
-
-if ! echo "import django; print (1,4,5) == django.VERSION[0:3]" | python 2>/dev/null | grep True >/dev/null; then
-    echo -e "This program needs Django 1.4.5. Please install with\n\nsudo pip install django==1.4.5"
-    return 2
-fi
-
-
-
-# Determine the action. If specified by arguments, fine, if not, toggle it
-if [ "x$1" == "xstart" ] || [ "x$1" == "xstop" ]; then
-    CMD="$1"
-else
-    if [ -z "$BBSERVER" ]; then
-        CMD="start"
-    else
-        CMD="stop"
-    fi;
-fi
-
-NOTOASTERUI=0
-if [ "x$2" == "xnoui" ]; then
-    NOTOASTERUI=1
-fi
-
-echo "The system will $CMD."
-
-# Make sure it's safe to run by checking bitbake lock
-
-lock=1
-if [ -e $BUILDDIR/bitbake.lock ]; then
-    (flock -n 200 ) 200<$BUILDDIR/bitbake.lock || lock=0
-fi
-
-if [ ${CMD} == "start" ] && ( [ $lock -eq 0 ] || [ -e $BUILDDIR/.toastermain.pid ] ); then
-    echo "Error: bitbake lock state error. System is already on." 2>&1
-    return 3
-elif [ ${CMD} == "stop" ] && ( [ $lock -eq 1 ] || ! [ -e $BUILDDIR/.toastermain.pid ] ) ; then
-    echo "Error: bitbake lock state error. Trying to stop a stopped system ?
-If you think the system is hanged up, you can try to manually stop system with the commands
-
-# BBSERVER=localhost:8200 bitbake -m
-
-and
-
-# webserverKillAll
-" 2>&1
-    return 3
-fi
-
-
-
-
-
-# Execute the commands
-
-case $CMD in
-    start )
-        addtoConfiguration "INHERIT+=\"toaster buildhistory\"" toaster.conf
-        webserverStartAll || return 4
-        unset BBSERVER
-        bitbake --postread conf/toaster.conf --server-only -t xmlrpc -B localhost:8200
-        export BBSERVER=localhost:8200
-        if [ $NOTOASTERUI == 0 ]; then        # we start the TOASTERUI only if not inhibited
-            bitbake --observe-only -u toasterui >${BUILDDIR}/toaster_ui.log 2>&1 & echo $! >${BUILDDIR}/.toasterui.pid
-        fi
-        # stop system on terminal exit
-        trap stop_system SIGHUP
-    ;;
-    stop )
-        stop_system
-        trap '' SIGHUP
-    ;;
-esac
-
-echo "Successful ${CMD}."
-

bitbake/contrib/vim/plugin/newbb.vim

@@ -17,7 +17,7 @@ endif
 fun! <SID>GetUserName()
     let l:user_name = system("git config --get user.name")
     if v:shell_error
-        return "Unknown User"
+        return "Unknow User"
     else
         return substitute(l:user_name, "\n", "", "")
 endfun

bitbake/lib/bb/__init__.py

@@ -21,7 +21,7 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-__version__ = "1.21.0"
+__version__ = "1.20.0"
 
 import sys
 if sys.version_info < (2, 7, 3):
@@ -141,3 +141,6 @@ def deprecate_import(current, modulename, fromlist, renames = None):
 
         setattr(sys.modules[current], newname, newobj)
 
+deprecate_import(__name__, "bb.fetch", ("MalformedUrl", "encodeurl", "decodeurl"))
+deprecate_import(__name__, "bb.utils", ("mkdirhier", "movefile", "copyfile", "which"))
+deprecate_import(__name__, "bb.utils", ["vercmp_string"], ["vercmp"])

bitbake/lib/bb/build.py

@@ -91,9 +91,6 @@ class TaskBase(event.Event):
 
 class TaskStarted(TaskBase):
     """Task execution started"""
-    def __init__(self, t, logfile, taskflags, d):
-        super(TaskStarted, self).__init__(t, logfile, d)
-        self.taskflags = taskflags
 
 class TaskSucceeded(TaskBase):
     """Task execution completed"""
@@ -425,9 +422,7 @@ def _exec_task(fn, task, d, quieterr):
     localdata.setVar('BB_LOGFILE', logfn)
     localdata.setVar('BB_RUNTASK', task)
 
-    flags = localdata.getVarFlags(task)
-
-    event.fire(TaskStarted(task, logfn, flags, localdata), localdata)
+    event.fire(TaskStarted(task, logfn, localdata), localdata)
     try:
         for func in (prefuncs or '').split():
             exec_func(func, localdata)

bitbake/lib/bb/codeparser.py

@@ -35,7 +35,7 @@ def check_indent(codestr):
 
 class CodeParserCache(MultiProcessCache):
     cache_file_name = "bb_codeparser.dat"
-    CACHE_VERSION = 4
+    CACHE_VERSION = 3
 
     def __init__(self):
         MultiProcessCache.__init__(self)
@@ -64,8 +64,6 @@ class CodeParserCache(MultiProcessCache):
         for h in data[0]:
             data[0][h]["refs"] = self.internSet(data[0][h]["refs"])
             data[0][h]["execs"] = self.internSet(data[0][h]["execs"])
-            for k in data[0][h]["contains"]:
-                data[0][h]["contains"][k] = self.internSet(data[0][h]["contains"][k])
         for h in data[1]:
             data[1][h]["execs"] = self.internSet(data[1][h]["execs"])
         return
@@ -124,13 +122,7 @@ class PythonParser():
         name = self.called_node_name(node.func)
         if name in self.getvars or name in self.containsfuncs:
             if isinstance(node.args[0], ast.Str):
-                varname = node.args[0].s
-                if name in self.containsfuncs and isinstance(node.args[1], ast.Str):
-                    if varname not in self.contains:
-                        self.contains[varname] = set()
-                    self.contains[varname].add(node.args[1].s)
-                else:                      
-                    self.references.add(node.args[0].s)
+                self.var_references.add(node.args[0].s)
             else:
                 self.warn(node.func, node.args[0])
         elif name in self.execfuncs:
@@ -155,11 +147,11 @@ class PythonParser():
                 break
 
     def __init__(self, name, log):
+        self.var_references = set()
         self.var_execs = set()
-        self.contains = {}
         self.execs = set()
         self.references = set()
-        self.log = BufferedLogger('BitBake.Data.PythonParser', logging.DEBUG, log)
+        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)
@@ -170,15 +162,14 @@ class PythonParser():
         if h in codeparsercache.pythoncache:
             self.references = codeparsercache.pythoncache[h]["refs"]
             self.execs = codeparsercache.pythoncache[h]["execs"]
-            self.contains = codeparsercache.pythoncache[h]["contains"]
             return
 
         if h in codeparsercache.pythoncacheextras:
             self.references = codeparsercache.pythoncacheextras[h]["refs"]
             self.execs = codeparsercache.pythoncacheextras[h]["execs"]
-            self.contains = codeparsercache.pythoncacheextras[h]["contains"]
             return
 
+
         code = compile(check_indent(str(node)), "<string>", "exec",
                        ast.PyCF_ONLY_AST)
 
@@ -186,12 +177,12 @@ class PythonParser():
             if n.__class__.__name__ == "Call":
                 self.visit_Call(n)
 
+        self.references.update(self.var_references)
         self.references.update(self.var_execs)
 
         codeparsercache.pythoncacheextras[h] = {}
         codeparsercache.pythoncacheextras[h]["refs"] = self.references
         codeparsercache.pythoncacheextras[h]["execs"] = self.execs
-        codeparsercache.pythoncacheextras[h]["contains"] = self.contains
 
 class ShellParser():
     def __init__(self, name, log):

bitbake/lib/bb/command.py

@@ -196,11 +196,18 @@ class CommandsSync:
         """
         command.cooker.disableDataTracking()
 
-    def setPrePostConfFiles(self, command, params):
-        prefiles = params[0].split()
-        postfiles = params[1].split()
-        command.cooker.configuration.prefile = prefiles
-        command.cooker.configuration.postfile = postfiles
+    def initCooker(self, command, params):
+        """
+        Init the cooker to initial state with nothing parsed
+        """
+        command.cooker.initialize()
+
+    def resetCooker(self, command, params):
+        """
+        Reset the cooker to its initial state, thus forcing a reparse for
+        any async command that has the needcache property set to True
+        """
+        command.cooker.reset()
 
     def getCpuCount(self, command, params):
         """
@@ -413,6 +420,18 @@ class CommandsAsync:
             command.finishAsyncCommand()
     compareRevisions.needcache = True
 
+    def parseConfigurationFiles(self, command, params):
+        """
+        Parse the configuration files
+        """
+        prefiles = params[0].split()
+        postfiles = params[1].split()
+        command.cooker.configuration.prefile = prefiles
+        command.cooker.configuration.postfile = postfiles
+        command.cooker.loadConfigurationData()
+        command.finishAsyncCommand()
+    parseConfigurationFiles.needcache = False
+
     def triggerEvent(self, command, params):
         """
         Trigger a certain event
@@ -422,12 +441,3 @@ class CommandsAsync:
         command.currentAsyncCommand = None
     triggerEvent.needcache = False
 
-    def resetCooker(self, command, params):
-        """
-        Reset the cooker to its initial state, thus forcing a reparse for
-        any async command that has the needcache property set to True
-        """
-        command.cooker.reset()
-        command.finishAsyncCommand()
-    resetCooker.needcache = False
-

bitbake/lib/bb/cooker.py

@@ -81,7 +81,7 @@ class SkippedPackage:
 
 
 class CookerFeatures(object):
-    _feature_list = [HOB_EXTRA_CACHES, SEND_DEPENDS_TREE, BASEDATASTORE_TRACKING] = range(3)
+    _feature_list = [HOB_EXTRA_CACHES, SEND_DEPENDS_TREE] = range(2)
 
     def __init__(self):
         self._features=set()
@@ -117,7 +117,7 @@ class BBCooker:
 
         self.configuration = configuration
 
-        self.initConfigurationData()
+        self.loadConfigurationData()
 
         # Take a lock so only one copy of bitbake can run against a given build
         # directory at a time
@@ -125,14 +125,6 @@ class BBCooker:
         self.lock = bb.utils.lockfile(lockfile, False, False)
         if not self.lock:
             bb.fatal("Only one copy of bitbake should be run against a build directory")
-        try:
-            self.lock.seek(0)
-            self.lock.truncate()
-            if len(configuration.interface) >= 2:
-                self.lock.write("%s:%s\n" % (configuration.interface[0], configuration.interface[1]));
-            self.lock.flush()
-        except:
-            pass
 
         # TOSTOP must not be set or our children will hang when they output
         fd = sys.stdout.fileno()
@@ -152,10 +144,8 @@ class BBCooker:
     def initConfigurationData(self):
 
         self.state = state.initial
-        self.caches_array = []
 
-        if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset:
-            self.enableDataTracking()
+        self.caches_array = []
 
         all_extra_cache_names = []
         # We hardcode all known cache types in a single place, here.
@@ -178,6 +168,16 @@ class BBCooker:
         self.databuilder = bb.cookerdata.CookerDataBuilder(self.configuration, False)
         self.data = self.databuilder.data
 
+    def enableDataTracking(self):
+        self.configuration.tracking = True
+        self.data.enableTracking()
+
+    def disableDataTracking(self):
+        self.configuration.tracking = False
+        self.data.disableTracking()
+
+    def loadConfigurationData(self):
+        self.initConfigurationData()
         self.databuilder.parseBaseConfiguration()
         self.data = self.databuilder.data
         self.data_hash = self.databuilder.data_hash
@@ -189,17 +189,6 @@ class BBCooker:
         bb.data.update_data(self.event_data)
         bb.parse.init_parser(self.event_data)
 
-        if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset:
-            self.disableDataTracking()
-
-    def enableDataTracking(self):
-        self.configuration.tracking = True
-        self.data.enableTracking()
-
-    def disableDataTracking(self):
-        self.configuration.tracking = False
-        self.data.disableTracking()
-
     def modifyConfigurationVar(self, var, val, default_file, op):
         if op == "append":
             self.appendConfigurationVar(var, val, default_file)
@@ -213,11 +202,20 @@ class BBCooker:
         #add append var operation to the end of default_file
         default_file = bb.cookerdata.findConfigFile(default_file, self.data)
 
-        total = "#added by hob"
+        with open(default_file, 'r') as f:
+            contents = f.readlines()
+        f.close()
+
+        total = ""
+        for c in contents:
+            total += c
+
+        total += "#added by hob"
         total += "\n%s += \"%s\"\n" % (var, val)
 
-        with open(default_file, 'a') as f:
+        with open(default_file, 'w') as f:
             f.write(total)
+        f.close()
 
         #add to history
         loginfo = {"op":append, "file":default_file, "line":total.count("\n")}
@@ -246,6 +244,7 @@ class BBCooker:
             if topdir in conf_file:
                 with open(conf_file, 'r') as f:
                     contents = f.readlines()
+                f.close()
 
                 lines = self.data.varhistory.get_variable_lines(var, conf_file)
                 for line in lines:
@@ -271,8 +270,12 @@ class BBCooker:
                         for ii in range(begin_line, end_line):
                             contents[ii] = "#" + contents[ii]
 
+                total = ""
+                for c in contents:
+                    total += c
                 with open(conf_file, 'w') as f:
-                    f.writelines(contents)
+                    f.write(total)
+                f.close()
 
         if replaced == False:
             #remove var from history
@@ -281,12 +284,21 @@ class BBCooker:
             #add var to the end of default_file
             default_file = bb.cookerdata.findConfigFile(default_file, self.data)
 
+            with open(default_file, 'r') as f:
+                contents = f.readlines()
+            f.close()
+
+            total = ""
+            for c in contents:
+                total += c
+
             #add the variable on a single line, to be easy to replace the second time
-            total = "\n#added by hob"
+            total += "\n#added by hob"
             total += "\n%s %s \"%s\"\n" % (var, op, val)
 
-            with open(default_file, 'a') as f:
+            with open(default_file, 'w') as f:
                 f.write(total)
+            f.close()
 
             #add to history
             loginfo = {"op":set, "file":default_file, "line":total.count("\n")}
@@ -300,6 +312,7 @@ class BBCooker:
             if topdir in conf_file:
                 with open(conf_file, 'r') as f:
                     contents = f.readlines()
+                f.close()
 
                 lines = self.data.varhistory.get_variable_lines(var, conf_file)
                 for line in lines:
@@ -322,8 +335,12 @@ class BBCooker:
                     #remove var from history
                     self.data.varhistory.del_var_history(var, conf_file, line)
 
+                total = ""
+                for c in contents:
+                    total += c
                 with open(conf_file, 'w') as f:
-                    f.writelines(contents)
+                    f.write(total)
+                f.close()
 
     def createConfigFile(self, name):
         path = os.getcwd()
@@ -331,6 +348,7 @@ class BBCooker:
         open(confpath, 'w').close()
 
     def parseConfiguration(self):
+
         # Set log file verbosity
         verboselogs = bb.utils.to_boolean(self.data.getVar("BB_VERBOSE_LOGS", "0"))
         if verboselogs:
@@ -493,7 +511,6 @@ class BBCooker:
         depend_tree["packages"] = {}
         depend_tree["rdepends-pkg"] = {}
         depend_tree["rrecs-pkg"] = {}
-        depend_tree["layer-priorities"] = self.recipecache.bbfile_config_priorities
 
         for task in xrange(len(rq.rqdata.runq_fnid)):
             taskname = rq.rqdata.runq_task[task]
@@ -505,7 +522,6 @@ class BBCooker:
                 depend_tree["pn"][pn] = {}
                 depend_tree["pn"][pn]["filename"] = fn
                 depend_tree["pn"][pn]["version"] = version
-                depend_tree["pn"][pn]["inherits"] = self.recipecache.inherits.get(fn, None)
 
                 # if we have extra caches, list all attributes they bring in
                 extra_info = []
@@ -710,9 +726,14 @@ class BBCooker:
         logger.info("Task dependencies saved to 'task-depends.dot'")
 
     def show_appends_with_no_recipes( self ):
+        recipes = set(os.path.basename(f)
+                      for f in self.recipecache.pkg_fn.iterkeys())
+        recipes |= set(os.path.basename(f)
+                      for f in self.skiplist.iterkeys())
+        appended_recipes = self.collection.appendlist.iterkeys()
         appends_without_recipes = [self.collection.appendlist[recipe]
-                                   for recipe in self.collection.appendlist
-                                   if recipe not in self.collection.appliedappendlist]
+                                   for recipe in appended_recipes
+                                   if recipe not in recipes]
         if appends_without_recipes:
             appendlines = ('  %s' % append
                            for appends in appends_without_recipes
@@ -1062,6 +1083,7 @@ class BBCooker:
 
         self.buildSetVars()
 
+        self.recipecache = bb.cache.CacheData(self.caches_array)
         infos = bb.cache.Cache.parse(fn, self.collection.get_file_appends(fn), \
                                      self.data,
                                      self.caches_array)
@@ -1108,13 +1130,10 @@ class BBCooker:
 
         def buildFileIdle(server, rq, abort):
 
-            msg = None
             if abort or self.state == state.forceshutdown:
                 rq.finish_runqueue(True)
-                msg = "Forced shutdown"
             elif self.state == state.shutdown:
                 rq.finish_runqueue(False)
-                msg = "Stopped build"
             failures = 0
             try:
                 retval = rq.execute_runqueue()
@@ -1127,7 +1146,7 @@ class BBCooker:
 
             if not retval:
                 bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, item, failures), self.event_data)
-                self.command.finishAsyncCommand(msg)
+                self.command.finishAsyncCommand()
                 return False
             if retval is True:
                 return True
@@ -1141,13 +1160,10 @@ class BBCooker:
         """
 
         def buildTargetsIdle(server, rq, abort):
-            msg = None
             if abort or self.state == state.forceshutdown:
                 rq.finish_runqueue(True)
-                msg = "Forced shutdown"
             elif self.state == state.shutdown:
                 rq.finish_runqueue(False)
-                msg = "Stopped build"
             failures = 0
             try:
                 retval = rq.execute_runqueue()
@@ -1160,7 +1176,7 @@ class BBCooker:
 
             if not retval:
                 bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, targets, failures), self.data)
-                self.command.finishAsyncCommand(msg)
+                self.command.finishAsyncCommand()
                 return False
             if retval is True:
                 return True
@@ -1186,10 +1202,7 @@ class BBCooker:
             try:
                 v = self.data.getVar(k, True)
                 if not k.startswith("__") and not isinstance(v, bb.data_smart.DataSmart):
-                    dump[k] = {
-    'v' : v ,
-    'history' : self.data.varhistory.variable(k),
-                    }
+                    dump[k] = { 'v' : v }
                     for d in flaglist:
                         dump[k][d] = self.data.getVarFlag(k, d)
             except Exception as e:
@@ -1282,11 +1295,6 @@ class BBCooker:
         if len(pkgs_to_build) == 0:
             raise NothingToBuild
 
-        ignore = (self.data.getVar("ASSUME_PROVIDED", True) or "").split()
-        for pkg in pkgs_to_build:
-            if pkg in ignore:
-                parselog.warn("Explicit target \"%s\" is in ASSUME_PROVIDED, ignoring" % pkg)
-
         if 'world' in pkgs_to_build:
             self.buildWorldTargetList()
             pkgs_to_build.remove('world')
@@ -1329,9 +1337,12 @@ class BBCooker:
     def finishcommand(self):
         self.state = state.initial
 
-    def reset(self):
+    def initialize(self):
         self.initConfigurationData()
 
+    def reset(self):
+        self.loadConfigurationData()
+
 def server_main(cooker, func, *args):
     cooker.pre_serve()
 
@@ -1367,7 +1378,6 @@ class CookerExit(bb.event.Event):
 class CookerCollectFiles(object):
     def __init__(self, priorities):
         self.appendlist = {}
-        self.appliedappendlist = []
         self.bbfile_config_priorities = priorities
 
     def calc_bbfile_priority( self, filename, matched = None ):
@@ -1484,14 +1494,10 @@ class CookerCollectFiles(object):
         """
         Returns a list of .bbappend files to apply to fn
         """
-        filelist = []
         f = os.path.basename(fn)
-        for bbappend in self.appendlist:
-            if (bbappend == f) or ('%' in bbappend and bbappend.startswith(f[:bbappend.index('%')])):
-                self.appliedappendlist.append(bbappend)
-                for filename in self.appendlist[bbappend]:
-                    filelist.append(filename)
-        return filelist
+        if f in self.appendlist:
+            return self.appendlist[f]
+        return []
 
     def collection_priorities(self, pkgfns):
 

bitbake/lib/bb/cookerdata.py

@@ -127,7 +127,6 @@ class CookerConfiguration(object):
         self.dump_signatures = False
         self.dry_run = False
         self.tracking = False
-        self.interface = []
 
         self.env = {}
 

bitbake/lib/bb/data.py

@@ -299,21 +299,6 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
         vardeps = varflags.get("vardeps")
         value = d.getVar(key, False)
 
-        def handle_contains(value, contains, d):
-            newvalue = ""
-            for k in contains:
-                l = (d.getVar(k, True) or "").split()
-                for word in contains[k]:
-                    if word in l:
-                        newvalue += "\n%s{%s} = Set" %  (k, word)
-                    else:
-                        newvalue += "\n%s{%s} = Unset" %  (k, word)
-            if not newvalue:
-                return value
-            if not value:
-                return newvalue
-            return value + newvalue
-
         if "vardepvalue" in varflags:
            value = varflags.get("vardepvalue")
         elif varflags.get("func"):
@@ -324,7 +309,6 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
                     logger.warn("Variable %s contains tabs, please remove these (%s)" % (key, d.getVar("FILE", True)))
                 parser.parse_python(parsedvar.value)
                 deps = deps | parser.references
-                value = handle_contains(value, parser.contains, d)
             else:
                 parsedvar = d.expandWithRefs(value, key)
                 parser = bb.codeparser.ShellParser(key, logger)
@@ -334,12 +318,10 @@ def build_dependencies(key, keys, shelldeps, varflagsexcl, d):
                 parser.log.flush()
             deps = deps | parsedvar.references
             deps = deps | (keys & parser.execs) | (keys & parsedvar.execs)
-            value = handle_contains(value, parsedvar.contains, d)
         else:
             parser = d.expandWithRefs(value, key)
             deps |= parser.references
             deps = deps | (keys & parser.execs)
-            value = handle_contains(value, parser.contains, d)
 
         # Add varflags, assuming an exclusion list is set
         if varflagsexcl:

bitbake/lib/bb/data_smart.py

@@ -88,7 +88,6 @@ class VariableParse:
 
         self.references = set()
         self.execs = set()
-        self.contains = {}
 
     def var_sub(self, match):
             key = match.group()[2:-1]
@@ -99,7 +98,7 @@ class VariableParse:
                 varparse = self.d.expand_cache[key]
                 var = varparse.value
             else:
-                var = self.d.getVarFlag(key, "_content", True)
+                var = self.d.getVar(key, True)
             self.references.add(key)
             if var is not None:
                 return var
@@ -121,11 +120,6 @@ class VariableParse:
             self.references |= parser.references
             self.execs |= parser.execs
 
-            for k in parser.contains:
-                if k not in self.contains:
-                    self.contains[k] = parser.contains[k]
-                else:
-                    self.contains[k].update(parser.contains[k])
             value = utils.better_eval(codeobj, DataContext(self.d))
             return str(value)
 

bitbake/lib/bb/fetch2/__init__.py

@@ -329,7 +329,7 @@ def decodeurl(url):
     user, password, parameters).
     """
 
-    m = re.compile('(?P<type>[^:]*)://((?P<user>.+)@)?(?P<location>[^;]+)(;(?P<parm>.*))?').match(url)
+    m = re.compile('(?P<type>[^:]*)://((?P<user>[^/]+)@)?(?P<location>[^;]+)(;(?P<parm>.*))?').match(url)
     if not m:
         raise MalformedUrl(url)
 
@@ -507,7 +507,7 @@ def fetcher_compare_revisions(d):
 def mirror_from_string(data):
     return [ i.split() for i in (data or "").replace('\\n','\n').split('\n') if i ]
 
-def verify_checksum(ud, d):
+def verify_checksum(u, ud, d):
     """
     verify the MD5 and SHA256 checksum for downloaded src
 
@@ -530,7 +530,7 @@ def verify_checksum(ud, d):
             raise NoChecksumError('No checksum specified for %s, please add at least one to the recipe:\n'
                              'SRC_URI[%s] = "%s"\nSRC_URI[%s] = "%s"' %
                              (ud.localpath, ud.md5_name, md5data,
-                              ud.sha256_name, sha256data), ud.url)
+                              ud.sha256_name, sha256data), u)
 
         # Log missing sums so user can more easily add them
         if ud.md5_expected == None:
@@ -568,10 +568,10 @@ def verify_checksum(ud, d):
         msg = msg + '\nIf this change is expected (e.g. you have upgraded to a new version without updating the checksums) then you can use these lines within the recipe:\nSRC_URI[%s] = "%s"\nSRC_URI[%s] = "%s"\nOtherwise you should retry the download and/or check with upstream to determine if the file has become corrupted or otherwise unexpectedly modified.\n' % (ud.md5_name, md5data, ud.sha256_name, sha256data)
 
     if len(msg):
-        raise ChecksumError('Checksum mismatch!%s' % msg, ud.url, md5data)
+        raise ChecksumError('Checksum mismatch!%s' % msg, u, md5data)
 
 
-def update_stamp(ud, d):
+def update_stamp(u, ud, d):
     """
         donestamp is file stamp indicating the whole fetching is done
         this function update the stamp after verifying the checksum
@@ -584,7 +584,7 @@ def update_stamp(ud, d):
             # Errors aren't fatal here
             pass
     else:
-        verify_checksum(ud, d)
+        verify_checksum(u, ud, d)
         open(ud.donestamp, 'w').close()
 
 def subprocess_setup():
@@ -619,7 +619,7 @@ def get_srcrev(d):
         raise FetchError("SRCREV was used yet no valid SCM was found in SRC_URI")
 
     if len(scms) == 1 and len(urldata[scms[0]].names) == 1:
-        autoinc, rev = urldata[scms[0]].method.sortable_revision(urldata[scms[0]], d, urldata[scms[0]].names[0])
+        autoinc, rev = urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d, urldata[scms[0]].names[0])
         if len(rev) > 10:
             rev = rev[:10]
         if autoinc:
@@ -637,7 +637,7 @@ def get_srcrev(d):
     for scm in scms:
         ud = urldata[scm]
         for name in ud.names:
-            autoinc, rev = ud.method.sortable_revision(ud, d, name)
+            autoinc, rev = ud.method.sortable_revision(scm, ud, d, name)
             seenautoinc = seenautoinc or autoinc
             if len(rev) > 10:
                 rev = rev[:10]
@@ -730,7 +730,7 @@ def build_mirroruris(origud, mirrors, ld):
     replacements["BASENAME"] = origud.path.split("/")[-1]
     replacements["MIRRORNAME"] = origud.host.replace(':','.') + origud.path.replace('/', '.').replace('*', '.')
 
-    def adduri(ud, uris, uds):
+    def adduri(uri, ud, uris, uds):
         for line in mirrors:
             try:
                 (find, replace) = line
@@ -753,9 +753,9 @@ def build_mirroruris(origud, mirrors, ld):
             uris.append(newuri)
             uds.append(newud)
 
-            adduri(newud, uris, uds)
+            adduri(newuri, newud, uris, uds)
 
-    adduri(origud, uris, uds)
+    adduri(None, origud, uris, uds)
 
     return uris, uds
 
@@ -772,22 +772,22 @@ def rename_bad_checksum(ud, suffix):
     bb.utils.movefile(ud.localpath, new_localpath)
 
 
-def try_mirror_url(origud, ud, ld, check = False):
+def try_mirror_url(newuri, origud, ud, ld, check = False):
     # Return of None or a value means we're finished
     # False means try another url
     try:
         if check:
-            found = ud.method.checkstatus(ud, ld)
+            found = ud.method.checkstatus(newuri, ud, ld)
             if found:
                 return found
             return False
 
         os.chdir(ld.getVar("DL_DIR", True))
 
-        if not os.path.exists(ud.donestamp) or ud.method.need_update(ud, ld):
-            ud.method.download(ud, ld)
+        if not os.path.exists(ud.donestamp) or ud.method.need_update(newuri, ud, ld):
+            ud.method.download(newuri, ud, ld)
             if hasattr(ud.method,"build_mirror_data"):
-                ud.method.build_mirror_data(ud, ld)
+                ud.method.build_mirror_data(newuri, ud, ld)
 
         if not ud.localpath or not os.path.exists(ud.localpath):
             return False
@@ -805,11 +805,11 @@ def try_mirror_url(origud, ud, ld, check = False):
             dest = os.path.join(dldir, os.path.basename(ud.localpath))
             if not os.path.exists(dest):
                 os.symlink(ud.localpath, dest)
-            if not os.path.exists(origud.donestamp) or origud.method.need_update(origud, ld):
-                origud.method.download(origud, ld)
-                if hasattr(ud.method,"build_mirror_data"):
-                    origud.method.build_mirror_data(origud, ld)
-            return None
+            if not os.path.exists(origud.donestamp) or origud.method.need_update(origud.url, origud, ld):
+                origud.method.download(origud.url, origud, ld)
+                if hasattr(origud.method,"build_mirror_data"):
+                    origud.method.build_mirror_data(origud.url, origud, ld)
+            return ud.localpath
         # Otherwise the result is a local file:// and we symlink to it
         if not os.path.exists(origud.localpath):
             if os.path.islink(origud.localpath):
@@ -817,7 +817,7 @@ def try_mirror_url(origud, ud, ld, check = False):
                 os.unlink(origud.localpath)
 
             os.symlink(ud.localpath, origud.localpath)
-        update_stamp(origud, ld)
+        update_stamp(newuri, origud, ld)
         return ud.localpath
 
     except bb.fetch2.NetworkAccess:
@@ -825,13 +825,13 @@ def try_mirror_url(origud, ud, ld, check = False):
 
     except bb.fetch2.BBFetchException as e:
         if isinstance(e, ChecksumError):
-            logger.warn("Mirror checksum failure for url %s (original url: %s)\nCleaning and trying again." % (ud.url, origud.url))
+            logger.warn("Mirror checksum failure for url %s (original url: %s)\nCleaning and trying again." % (newuri, origud.url))
             logger.warn(str(e))
             rename_bad_checksum(ud, e.checksum)
         elif isinstance(e, NoChecksumError):
             raise
         else:
-            logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (ud.url, origud.url))
+            logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url))
             logger.debug(1, str(e))
         try:
             ud.method.clean(ud, ld)
@@ -853,7 +853,7 @@ def try_mirrors(d, origud, mirrors, check = False):
     uris, uds = build_mirroruris(origud, mirrors, ld)
 
     for index, uri in enumerate(uris):
-        ret = try_mirror_url(origud, uds[index], ld, check)
+        ret = try_mirror_url(uri, origud, uds[index], ld, check)
         if ret != False:
             return ret
     return None
@@ -888,7 +888,7 @@ def srcrev_internal_helper(ud, d, name):
             var = "SRCREV_%s_pn-%s" % (name, pn)
         raise FetchError("Please set %s to a valid value" % var, ud.url)
     if rev == "AUTOINC":
-        rev = ud.method.latest_revision(ud, d, name)
+        rev = ud.method.latest_revision(ud.url, ud, d, name)
 
     return rev
 
@@ -1009,7 +1009,7 @@ class FetchData(object):
 
         self.method = None
         for m in methods:
-            if m.supports(self, d):
+            if m.supports(url, self, d):
                 self.method = m
                 break                
 
@@ -1031,7 +1031,7 @@ class FetchData(object):
             self.localpath = self.parm["localpath"]
             self.basename = os.path.basename(self.localpath)
         elif self.localfile:
-            self.localpath = self.method.localpath(self, d)
+            self.localpath = self.method.localpath(self.url, self, d)
 
         dldir = d.getVar("DL_DIR", True)
         # Note: .done and .lock files should always be in DL_DIR whereas localpath may not be.
@@ -1055,7 +1055,7 @@ class FetchData(object):
 
     def setup_localpath(self, d):
         if not self.localpath:
-            self.localpath = self.method.localpath(self, d)
+            self.localpath = self.method.localpath(self.url, self, d)
 
     def getSRCDate(self, d):
         """
@@ -1079,13 +1079,13 @@ class FetchMethod(object):
     def __init__(self, urls = []):
         self.urls = []
 
-    def supports(self, urldata, d):
+    def supports(self, url, urldata, d):
         """
         Check to see if this fetch class supports a given url.
         """
         return 0
 
-    def localpath(self, urldata, d):
+    def localpath(self, url, urldata, d):
         """
         Return the local filename of a given url assuming a successful fetch.
         Can also setup variables in urldata for use in go (saving code duplication
@@ -1129,7 +1129,7 @@ class FetchMethod(object):
 
     urls = property(getUrls, setUrls, None, "Urls property")
 
-    def need_update(self, ud, d):
+    def need_update(self, url, ud, d):
         """
         Force a fetch, even if localpath exists?
         """
@@ -1143,7 +1143,7 @@ class FetchMethod(object):
         """
         return False
 
-    def download(self, urldata, d):
+    def download(self, url, urldata, d):
         """
         Fetch urls
         Assumes localpath was called first
@@ -1267,13 +1267,13 @@ class FetchMethod(object):
        """
        bb.utils.remove(urldata.localpath)
 
-    def try_premirror(self, urldata, d):
+    def try_premirror(self, url, urldata, d):
         """
         Should premirrors be used?
         """
         return True
 
-    def checkstatus(self, urldata, d):
+    def checkstatus(self, url, urldata, d):
         """
         Check the status of a URL
         Assumes localpath was called first
@@ -1281,7 +1281,7 @@ class FetchMethod(object):
         logger.info("URL %s could not be checked for status since no method exists.", url)
         return True
 
-    def latest_revision(self, ud, d, name):
+    def latest_revision(self, url, ud, d, name):
         """
         Look in the cache for the latest revision, if not present ask the SCM.
         """
@@ -1289,19 +1289,19 @@ class FetchMethod(object):
             raise ParameterError("The fetcher for this URL does not support _latest_revision", url)
 
         revs = bb.persist_data.persist('BB_URI_HEADREVS', d)
-        key = self.generate_revision_key(ud, d, name)
+        key = self.generate_revision_key(url, ud, d, name)
         try:
             return revs[key]
         except KeyError:
-            revs[key] = rev = self._latest_revision(ud, d, name)
+            revs[key] = rev = self._latest_revision(url, ud, d, name)
             return rev
 
-    def sortable_revision(self, ud, d, name):
-        latest_rev = self._build_revision(ud, d, name)
+    def sortable_revision(self, url, ud, d, name):
+        latest_rev = self._build_revision(url, ud, d, name)
         return True, str(latest_rev)
 
-    def generate_revision_key(self, ud, d, name):
-        key = self._revision_key(ud, d, name)
+    def generate_revision_key(self, url, ud, d, name):
+        key = self._revision_key(url, ud, d, name)
         return "%s-%s" % (key, d.getVar("PN", True) or "")
 
 class Fetch(object):
@@ -1372,9 +1372,9 @@ class Fetch(object):
             try:
                 self.d.setVar("BB_NO_NETWORK", network)
  
-                if os.path.exists(ud.donestamp) and not m.need_update(ud, self.d):
+                if os.path.exists(ud.donestamp) and not m.need_update(u, ud, self.d):
                     localpath = ud.localpath
-                elif m.try_premirror(ud, self.d):
+                elif m.try_premirror(u, ud, self.d):
                     logger.debug(1, "Trying PREMIRRORS")
                     mirrors = mirror_from_string(self.d.getVar('PREMIRRORS', True))
                     localpath = try_mirrors(self.d, ud, mirrors, False)
@@ -1385,16 +1385,16 @@ class Fetch(object):
                 os.chdir(self.d.getVar("DL_DIR", True))
 
                 firsterr = None
-                if not localpath and ((not os.path.exists(ud.donestamp)) or m.need_update(ud, self.d)):
+                if not localpath and ((not os.path.exists(ud.donestamp)) or m.need_update(u, ud, self.d)):
                     try:
                         logger.debug(1, "Trying Upstream")
-                        m.download(ud, self.d)
+                        m.download(u, ud, self.d)
                         if hasattr(m, "build_mirror_data"):
-                            m.build_mirror_data(ud, self.d)
+                            m.build_mirror_data(u, ud, self.d)
                         localpath = ud.localpath
                         # early checksum verify, so that if checksum mismatched,
                         # fetcher still have chance to fetch from mirror
-                        update_stamp(ud, self.d)
+                        update_stamp(u, ud, self.d)
 
                     except bb.fetch2.NetworkAccess:
                         raise
@@ -1421,7 +1421,7 @@ class Fetch(object):
                         logger.error(str(firsterr))
                     raise FetchError("Unable to fetch URL from any source.", u)
 
-                update_stamp(ud, self.d)
+                update_stamp(u, ud, self.d)
 
             except BBFetchException as e:
                 if isinstance(e, NoChecksumError):
@@ -1452,7 +1452,7 @@ class Fetch(object):
             if not ret:
                 # Next try checking from the original uri, u
                 try:
-                    ret = m.checkstatus(ud, self.d)
+                    ret = m.checkstatus(u, ud, self.d)
                 except:
                     # Finally, try checking uri, u, from MIRRORS
                     mirrors = mirror_from_string(self.d.getVar('MIRRORS', True))

bitbake/lib/bb/fetch2/bzr.py

@@ -34,7 +34,7 @@ from bb.fetch2 import runfetchcmd
 from bb.fetch2 import logger
 
 class Bzr(FetchMethod):
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         return ud.type in ['bzr']
 
     def urldata_init(self, ud, d):
@@ -48,7 +48,7 @@ class Bzr(FetchMethod):
         ud.setup_revisons(d)
 
         if not ud.revision:
-            ud.revision = self.latest_revision(ud, d)
+            ud.revision = self.latest_revision(ud.url, ud, d)
 
         ud.localfile = data.expand('bzr_%s_%s_%s.tar.gz' % (ud.host, ud.path.replace('/', '.'), ud.revision), d)
 
@@ -81,12 +81,12 @@ class Bzr(FetchMethod):
 
         return bzrcmd
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
         """Fetch url"""
 
         if os.access(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir), '.bzr'), os.R_OK):
             bzrcmd = self._buildbzrcommand(ud, d, "update")
-            logger.debug(1, "BZR Update %s", ud.url)
+            logger.debug(1, "BZR Update %s", loc)
             bb.fetch2.check_network_access(d, bzrcmd, ud.url)
             os.chdir(os.path.join (ud.pkgdir, os.path.basename(ud.path)))
             runfetchcmd(bzrcmd, d)
@@ -94,7 +94,7 @@ class Bzr(FetchMethod):
             bb.utils.remove(os.path.join(ud.pkgdir, os.path.basename(ud.pkgdir)), True)
             bzrcmd = self._buildbzrcommand(ud, d, "fetch")
             bb.fetch2.check_network_access(d, bzrcmd, ud.url)
-            logger.debug(1, "BZR Checkout %s", ud.url)
+            logger.debug(1, "BZR Checkout %s", loc)
             bb.utils.mkdirhier(ud.pkgdir)
             os.chdir(ud.pkgdir)
             logger.debug(1, "Running %s", bzrcmd)
@@ -114,17 +114,17 @@ class Bzr(FetchMethod):
     def supports_srcrev(self):
         return True
 
-    def _revision_key(self, ud, d, name):
+    def _revision_key(self, url, ud, d, name):
         """
         Return a unique key for the url
         """
         return "bzr:" + ud.pkgdir
 
-    def _latest_revision(self, ud, d, name):
+    def _latest_revision(self, url, ud, d, name):
         """
         Return the latest upstream revision number
         """
-        logger.debug(2, "BZR fetcher hitting network for %s", ud.url)
+        logger.debug(2, "BZR fetcher hitting network for %s", url)
 
         bb.fetch2.check_network_access(d, self._buildbzrcommand(ud, d, "revno"), ud.url)
 
@@ -132,12 +132,12 @@ class Bzr(FetchMethod):
 
         return output.strip()
 
-    def sortable_revision(self, ud, d, name):
+    def sortable_revision(self, url, ud, d, name):
         """
         Return a sortable revision number which in our case is the revision number
         """
 
-        return False, self._build_revision(ud, d)
+        return False, self._build_revision(url, ud, d)
 
-    def _build_revision(self, ud, d):
+    def _build_revision(self, url, ud, d):
         return ud.revision

bitbake/lib/bb/fetch2/cvs.py

@@ -36,7 +36,7 @@ class Cvs(FetchMethod):
     """
     Class to fetch a module or modules from cvs repositories
     """
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with cvs.
         """
@@ -65,14 +65,14 @@ class Cvs(FetchMethod):
 
         ud.localfile = bb.data.expand('%s_%s_%s_%s%s%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.tag, ud.date, norecurse, fullpath), d)
 
-    def need_update(self, ud, d):
+    def need_update(self, url, ud, d):
         if (ud.date == "now"):
             return True
         if not os.path.exists(ud.localpath):
             return True
         return False
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
 
         method = ud.parm.get('method', 'pserver')
         localdir = ud.parm.get('localdir', ud.module)
@@ -124,13 +124,13 @@ class Cvs(FetchMethod):
         pkgdir = os.path.join(d.getVar('CVSDIR', True), pkg)
         moddir = os.path.join(pkgdir, localdir)
         if os.access(os.path.join(moddir, 'CVS'), os.R_OK):
-            logger.info("Update " + ud.url)
+            logger.info("Update " + loc)
             bb.fetch2.check_network_access(d, cvsupdatecmd, ud.url)
             # update sources there
             os.chdir(moddir)
             cmd = cvsupdatecmd
         else:
-            logger.info("Fetch " + ud.url)
+            logger.info("Fetch " + loc)
             # check out sources there
             bb.utils.mkdirhier(pkgdir)
             os.chdir(pkgdir)

bitbake/lib/bb/fetch2/git.py

@@ -73,7 +73,7 @@ class Git(FetchMethod):
     def init(self, d):
         pass
 
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with git.
         """
@@ -125,7 +125,7 @@ class Git(FetchMethod):
             if not ud.revisions[name] or len(ud.revisions[name]) != 40  or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]):
                 if ud.revisions[name]:
                     ud.branches[name] = ud.revisions[name]
-                ud.revisions[name] = self.latest_revision(ud, d, name)
+                ud.revisions[name] = self.latest_revision(ud.url, ud, d, name)
 
         gitsrcname = '%s%s' % (ud.host.replace(':','.'), ud.path.replace('/', '.').replace('*', '.'))
         # for rebaseable git repo, it is necessary to keep mirror tar ball
@@ -142,21 +142,21 @@ class Git(FetchMethod):
 
         ud.localfile = ud.clonedir
 
-    def localpath(self, ud, d):
+    def localpath(self, url, ud, d):
         return ud.clonedir
 
-    def need_update(self, ud, d):
+    def need_update(self, u, ud, d):
         if not os.path.exists(ud.clonedir):
             return True
         os.chdir(ud.clonedir)
         for name in ud.names:
-            if not self._contains_ref(ud.revisions[name], ud.branches[name], d):
+            if not self._contains_ref(ud.revisions[name], d):
                 return True
         if ud.write_tarballs and not os.path.exists(ud.fullmirror):
             return True
         return False
 
-    def try_premirror(self, ud, d):
+    def try_premirror(self, u, ud, d):
         # If we don't do this, updating an existing checkout with only premirrors
         # is not possible
         if d.getVar("BB_FETCH_PREMIRRORONLY", True) is not None:
@@ -165,7 +165,7 @@ class Git(FetchMethod):
             return False
         return True
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
         """Fetch url"""
 
         if ud.user:
@@ -197,7 +197,7 @@ class Git(FetchMethod):
         # Update the checkout if needed
         needupdate = False
         for name in ud.names:
-            if not self._contains_ref(ud.revisions[name], ud.branches[name], d):
+            if not self._contains_ref(ud.revisions[name], d):
                 needupdate = True
         if needupdate:
             try: 
@@ -214,7 +214,7 @@ class Git(FetchMethod):
             runfetchcmd("%s pack-redundant --all | xargs -r rm" % ud.basecmd, d)
             ud.repochanged = True
 
-    def build_mirror_data(self, ud, d):
+    def build_mirror_data(self, url, ud, d):
         # Generate a mirror tarball if needed
         if ud.write_tarballs and (ud.repochanged or not os.path.exists(ud.fullmirror)):
             # it's possible that this symlink points to read-only filesystem with PREMIRROR
@@ -281,24 +281,21 @@ class Git(FetchMethod):
     def supports_srcrev(self):
         return True
 
-    def _contains_ref(self, tag, branch, d):
+    def _contains_ref(self, tag, d):
         basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
-        cmd =  "%s branch --contains %s --list %s 2> /dev/null | wc -l" % (basecmd, tag, branch)
-        try:
-            output = runfetchcmd(cmd, d, quiet=True)
-        except bb.fetch2.FetchError:
-            return False
+        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))
         return output.split()[0] != "0"
 
-    def _revision_key(self, ud, d, name):
+    def _revision_key(self, url, ud, d, name):
         """
         Return a unique key for the url
         """
         return "git:" + ud.host + ud.path.replace('/', '.') + ud.branches[name]
 
-    def _latest_revision(self, ud, d, name):
+    def _latest_revision(self, url, ud, d, name):
         """
         Compute the HEAD revision for the url
         """
@@ -308,20 +305,20 @@ class Git(FetchMethod):
             username = ""
 
         basecmd = data.getVar("FETCHCMD_git", d, True) or "git"
-        cmd = "%s ls-remote %s://%s%s%s %s" % \
-              (basecmd, ud.proto, username, ud.host, ud.path, ud.branches[name])
+        cmd = "%s ls-remote %s://%s%s%s refs/heads/%s refs/tags/%s" % \
+              (basecmd, ud.proto, username, ud.host, ud.path, ud.branches[name], ud.branches[name])
         if ud.proto.lower() != 'file':
             bb.fetch2.check_network_access(d, cmd)
         output = runfetchcmd(cmd, d, True)
         if not output:
-            raise bb.fetch2.FetchError("The command %s gave empty output unexpectedly" % cmd, ud.url)
+            raise bb.fetch2.FetchError("The command %s gave empty output unexpectedly" % cmd, url)
         return output.split()[0]
 
-    def _build_revision(self, ud, d, name):
+    def _build_revision(self, url, ud, d, name):
         return ud.revisions[name]
 
-    def checkstatus(self, ud, d):
-        fetchcmd = "%s ls-remote %s" % (ud.basecmd, ud.url)
+    def checkstatus(self, uri, ud, d):
+        fetchcmd = "%s ls-remote %s" % (ud.basecmd, uri)
         try:
             runfetchcmd(fetchcmd, d, quiet=True)
             return True

bitbake/lib/bb/fetch2/gitsm.py

@@ -27,7 +27,7 @@ from   bb.fetch2 import runfetchcmd
 from   bb.fetch2 import logger
 
 class GitSM(Git):
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with git.
         """
@@ -42,7 +42,7 @@ class GitSM(Git):
                 pass
         return False
 
-    def update_submodules(self, ud, d):
+    def update_submodules(self, u, ud, d):
         # We have to convert bare -> full repo, do the submodule bit, then convert back
         tmpclonedir = ud.clonedir + ".tmp"
         gitdir = tmpclonedir + os.sep + ".git"
@@ -58,13 +58,13 @@ class GitSM(Git):
         os.rename(gitdir, ud.clonedir,)
         bb.utils.remove(tmpclonedir, True)
 
-    def download(self, ud, d):
-        Git.download(self, ud, d)
+    def download(self, loc, ud, d):
+        Git.download(self, loc, ud, d)
 
         os.chdir(ud.clonedir)
         submodules = self.uses_submodules(ud, d)
         if submodules:
-            self.update_submodules(ud, d)
+            self.update_submodules(loc, ud, d)
 
     def unpack(self, ud, destdir, d):
         Git.unpack(self, ud, destdir, d)

bitbake/lib/bb/fetch2/hg.py

@@ -37,7 +37,7 @@ from bb.fetch2 import logger
 
 class Hg(FetchMethod):
     """Class to fetch from mercurial repositories"""
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with mercurial.
         """
@@ -62,11 +62,11 @@ class Hg(FetchMethod):
         if 'rev' in ud.parm:
             ud.revision = ud.parm['rev']
         elif not ud.revision:
-            ud.revision = self.latest_revision(ud, d)
+            ud.revision = self.latest_revision(ud.url, ud, d)
 
         ud.localfile = data.expand('%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision), d)
 
-    def need_update(self, ud, d):
+    def need_update(self, url, ud, d):
         revTag = ud.parm.get('rev', 'tip')
         if revTag == "tip":
             return True
@@ -126,14 +126,14 @@ class Hg(FetchMethod):
 
         return cmd
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
         """Fetch url"""
 
         logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'")
 
         if os.access(os.path.join(ud.moddir, '.hg'), os.R_OK):
             updatecmd = self._buildhgcommand(ud, d, "pull")
-            logger.info("Update " + ud.url)
+            logger.info("Update " + loc)
             # update sources there
             os.chdir(ud.moddir)
             logger.debug(1, "Running %s", updatecmd)
@@ -142,7 +142,7 @@ class Hg(FetchMethod):
 
         else:
             fetchcmd = self._buildhgcommand(ud, d, "fetch")
-            logger.info("Fetch " + ud.url)
+            logger.info("Fetch " + loc)
             # check out sources there
             bb.utils.mkdirhier(ud.pkgdir)
             os.chdir(ud.pkgdir)
@@ -169,7 +169,7 @@ class Hg(FetchMethod):
     def supports_srcrev(self):
         return True
 
-    def _latest_revision(self, ud, d, name):
+    def _latest_revision(self, url, ud, d, name):
         """
         Compute tip revision for the url
         """
@@ -177,10 +177,10 @@ class Hg(FetchMethod):
         output = runfetchcmd(self._buildhgcommand(ud, d, "info"), d)
         return output.strip()
 
-    def _build_revision(self, ud, d, name):
+    def _build_revision(self, url, ud, d, name):
         return ud.revision
 
-    def _revision_key(self, ud, d, name):
+    def _revision_key(self, url, ud, d, name):
         """
         Return a unique key for the url
         """

bitbake/lib/bb/fetch2/local.py

@@ -34,7 +34,7 @@ from   bb.fetch2 import FetchMethod, FetchError
 from   bb.fetch2 import logger
 
 class Local(FetchMethod):
-    def supports(self, urldata, d):
+    def supports(self, url, urldata, d):
         """
         Check to see if a given url represents a local fetch.
         """
@@ -47,7 +47,7 @@ class Local(FetchMethod):
         ud.basepath = ud.decodedurl
         return
 
-    def localpath(self, urldata, d):
+    def localpath(self, url, urldata, d):
         """
         Return the local filename of a given url assuming a successful fetch.
         """
@@ -75,14 +75,14 @@ class Local(FetchMethod):
                 return dldirfile
         return newpath
 
-    def need_update(self, ud, d):
-        if ud.url.find("*") != -1:
+    def need_update(self, url, ud, d):
+        if url.find("*") != -1:
             return False
         if os.path.exists(ud.localpath):
             return False
         return True
 
-    def download(self, urldata, d):
+    def download(self, url, urldata, d):
         """Fetch urls (no-op for Local method)"""
         # no need to fetch local files, we'll deal with them in place.
         if self.supports_checksum(urldata) and not os.path.exists(urldata.localpath):
@@ -95,17 +95,17 @@ class Local(FetchMethod):
                 locations.append(filesdir)
             locations.append(d.getVar("DL_DIR", True))
 
-            msg = "Unable to find file " + urldata.url + " anywhere. The paths that were searched were:\n    " + "\n    ".join(locations)
+            msg = "Unable to find file " + url + " anywhere. The paths that were searched were:\n    " + "\n    ".join(locations)
             raise FetchError(msg)
 
         return True
 
-    def checkstatus(self, urldata, d):
+    def checkstatus(self, url, urldata, d):
         """
         Check the status of the url
         """
         if urldata.localpath.find("*") != -1:
-            logger.info("URL %s looks like a glob and was therefore not checked.", urldata.url)
+            logger.info("URL %s looks like a glob and was therefore not checked.", url)
             return True
         if os.path.exists(urldata.localpath):
             return True

bitbake/lib/bb/fetch2/osc.py

@@ -20,7 +20,7 @@ class Osc(FetchMethod):
     """Class to fetch a module or modules from Opensuse build server
        repositories."""
 
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with osc.
         """
@@ -77,7 +77,7 @@ class Osc(FetchMethod):
 
         return osccmd
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
         """
         Fetch url
         """
@@ -86,7 +86,7 @@ class Osc(FetchMethod):
 
         if os.access(os.path.join(data.expand('${OSCDIR}', d), ud.path, ud.module), os.R_OK):
             oscupdatecmd = self._buildosccommand(ud, d, "update")
-            logger.info("Update "+ ud.url)
+            logger.info("Update "+ loc)
             # update sources there
             os.chdir(ud.moddir)
             logger.debug(1, "Running %s", oscupdatecmd)
@@ -94,7 +94,7 @@ class Osc(FetchMethod):
             runfetchcmd(oscupdatecmd, d)
         else:
             oscfetchcmd = self._buildosccommand(ud, d, "fetch")
-            logger.info("Fetch " + ud.url)
+            logger.info("Fetch " + loc)
             # check out sources there
             bb.utils.mkdirhier(ud.pkgdir)
             os.chdir(ud.pkgdir)

bitbake/lib/bb/fetch2/perforce.py

@@ -37,7 +37,7 @@ from   bb.fetch2 import logger
 from   bb.fetch2 import runfetchcmd
 
 class Perforce(FetchMethod):
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         return ud.type in ['p4']
 
     def doparse(url, d):
@@ -120,12 +120,12 @@ class Perforce(FetchMethod):
 
         ud.localfile = data.expand('%s+%s+%s.tar.gz' % (host, base.replace('/', '.'), cset), d)
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
         """
         Fetch urls
         """
 
-        (host, depot, user, pswd, parm) = Perforce.doparse(ud.url, d)
+        (host, depot, user, pswd, parm) = Perforce.doparse(loc, d)
 
         if depot.find('/...') != -1:
             path = depot[:depot.find('/...')]
@@ -158,7 +158,7 @@ class Perforce(FetchMethod):
         tmpfile, errors = bb.process.run(data.getVar('MKTEMPDIRCMD', localdata, True) or "false")
         tmpfile = tmpfile.strip()
         if not tmpfile:
-            raise FetchError("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.", ud.url)
+            raise FetchError("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.", loc)
 
         if "label" in parm:
             depot = "%s@%s" % (depot, parm["label"])
@@ -167,13 +167,13 @@ class Perforce(FetchMethod):
             depot = "%s@%s" % (depot, cset)
 
         os.chdir(tmpfile)
-        logger.info("Fetch " + ud.url)
+        logger.info("Fetch " + loc)
         logger.info("%s%s files %s", p4cmd, p4opt, depot)
         p4file, errors = bb.process.run("%s%s files %s" % (p4cmd, p4opt, depot))
         p4file = [f.rstrip() for f in p4file.splitlines()]
 
         if not p4file:
-            raise FetchError("Fetch: unable to get the P4 files from %s" % depot, ud.url)
+            raise FetchError("Fetch: unable to get the P4 files from %s" % depot, loc)
 
         count = 0
 
@@ -191,7 +191,7 @@ class Perforce(FetchMethod):
 
         if count == 0:
             logger.error()
-            raise FetchError("Fetch: No files gathered from the P4 fetch", ud.url)
+            raise FetchError("Fetch: No files gathered from the P4 fetch", loc)
 
         runfetchcmd("tar -czf %s %s" % (ud.localpath, module), d, cleanup = [ud.localpath])
         # cleanup

bitbake/lib/bb/fetch2/repo.py

@@ -31,7 +31,7 @@ from   bb.fetch2 import runfetchcmd
 
 class Repo(FetchMethod):
     """Class to fetch a module or modules from repo (git) repositories"""
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with repo.
         """
@@ -53,7 +53,7 @@ class Repo(FetchMethod):
 
         ud.localfile = data.expand("repo_%s%s_%s_%s.tar.gz" % (ud.host, ud.path.replace("/", "."), ud.manifest, ud.branch), d)
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
         """Fetch url"""
 
         if os.access(os.path.join(data.getVar("DL_DIR", d, True), ud.localfile), os.R_OK):
@@ -91,8 +91,8 @@ class Repo(FetchMethod):
     def supports_srcrev(self):
         return False
 
-    def _build_revision(self, ud, d):
+    def _build_revision(self, url, ud, d):
         return ud.manifest
 
-    def _want_sortable_revision(self, ud, d):
+    def _want_sortable_revision(self, url, ud, d):
         return False

bitbake/lib/bb/fetch2/sftp.py

@@ -72,7 +72,7 @@ from bb.fetch2 import runfetchcmd
 class SFTP(FetchMethod):
     """Class to fetch urls via 'sftp'"""
 
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with sftp.
         """
@@ -95,10 +95,10 @@ class SFTP(FetchMethod):
 
         ud.localfile = data.expand(urllib.unquote(ud.basename), d)
 
-    def download(self, ud, d):
+    def download(self, uri, ud, d):
         """Fetch urls"""
 
-        urlo = URI(ud.url)
+        urlo = URI(uri)
         basecmd = 'sftp -oPasswordAuthentication=no'
         port = ''
         if urlo.port:
@@ -124,6 +124,6 @@ class SFTP(FetchMethod):
         cmd = '%s %s %s %s' % (basecmd, port, commands.mkarg(remote),
                                commands.mkarg(lpath))
 
-        bb.fetch2.check_network_access(d, cmd, ud.url)
+        bb.fetch2.check_network_access(d, cmd, uri)
         runfetchcmd(cmd, d)
         return True

bitbake/lib/bb/fetch2/ssh.py

@@ -72,8 +72,8 @@ __pattern__ = re.compile(r'''
 class SSH(FetchMethod):
     '''Class to fetch a module or modules via Secure Shell'''
 
-    def supports(self, urldata, d):
-        return __pattern__.match(urldata.url) != None
+    def supports(self, url, urldata, d):
+        return __pattern__.match(url) != None
 
     def supports_checksum(self, urldata):
         return False
@@ -89,10 +89,10 @@ class SSH(FetchMethod):
         host = m.group('host')
         urldata.localpath = os.path.join(d.getVar('DL_DIR', True), os.path.basename(path))
 
-    def download(self, urldata, d):
+    def download(self, url, urldata, d):
         dldir = d.getVar('DL_DIR', True)
 
-        m = __pattern__.match(urldata.url)
+        m = __pattern__.match(url)
         path = m.group('path')
         host = m.group('host')
         port = m.group('port')

bitbake/lib/bb/fetch2/svk.py

@@ -37,7 +37,7 @@ from   bb.fetch2 import runfetchcmd
 
 class Svk(FetchMethod):
     """Class to fetch a module or modules from svk repositories"""
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with svk.
         """
@@ -54,14 +54,14 @@ class Svk(FetchMethod):
 
         ud.localfile = data.expand('%s_%s_%s_%s_%s.tar.gz' % (ud.module.replace('/', '.'), ud.host, ud.path.replace('/', '.'), ud.revision, ud.date), d)
 
-    def need_update(self, ud, d):
+    def need_update(self, url, ud, d):
         if ud.date == "now":
             return True
         if not os.path.exists(ud.localpath):
             return True
         return False
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
         """Fetch urls"""
 
         svkroot = ud.host + ud.path
@@ -81,11 +81,11 @@ class Svk(FetchMethod):
         tmpfile = tmpfile.strip()
         if not tmpfile:
             logger.error()
-            raise FetchError("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.", ud.url)
+            raise FetchError("Fetch: unable to create temporary directory.. make sure 'mktemp' is in the PATH.", loc)
 
         # check out sources there
         os.chdir(tmpfile)
-        logger.info("Fetch " + ud.url)
+        logger.info("Fetch " + loc)
         logger.debug(1, "Running %s", svkcmd)
         runfetchcmd(svkcmd, d, cleanup = [tmpfile])
 

bitbake/lib/bb/fetch2/svn.py

@@ -37,7 +37,7 @@ from   bb.fetch2 import logger
 
 class Svn(FetchMethod):
     """Class to fetch a module or modules from svn repositories"""
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with svn.
         """
@@ -112,14 +112,14 @@ class Svn(FetchMethod):
 
         return svncmd
 
-    def download(self, ud, d):
+    def download(self, loc, ud, d):
         """Fetch url"""
 
         logger.debug(2, "Fetch: checking for module directory '" + ud.moddir + "'")
 
         if os.access(os.path.join(ud.moddir, '.svn'), os.R_OK):
             svnupdatecmd = self._buildsvncommand(ud, d, "update")
-            logger.info("Update " + ud.url)
+            logger.info("Update " + loc)
             # update sources there
             os.chdir(ud.moddir)
             # We need to attempt to run svn upgrade first in case its an older working format
@@ -132,7 +132,7 @@ class Svn(FetchMethod):
             runfetchcmd(svnupdatecmd, d)
         else:
             svnfetchcmd = self._buildsvncommand(ud, d, "fetch")
-            logger.info("Fetch " + ud.url)
+            logger.info("Fetch " + loc)
             # check out sources there
             bb.utils.mkdirhier(ud.pkgdir)
             os.chdir(ud.pkgdir)
@@ -160,13 +160,13 @@ class Svn(FetchMethod):
     def supports_srcrev(self):
         return True
 
-    def _revision_key(self, ud, d, name):
+    def _revision_key(self, url, ud, d, name):
         """
         Return a unique key for the url
         """
         return "svn:" + ud.moddir
 
-    def _latest_revision(self, ud, d, name):
+    def _latest_revision(self, url, ud, d, name):
         """
         Return the latest upstream revision number
         """
@@ -180,12 +180,12 @@ class Svn(FetchMethod):
 
         return revision
 
-    def sortable_revision(self, ud, d, name):
+    def sortable_revision(self, url, ud, d, name):
         """
         Return a sortable revision number which in our case is the revision number
         """
 
-        return False, self._build_revision(ud, d)
+        return False, self._build_revision(url, ud, d)
 
-    def _build_revision(self, ud, d):
+    def _build_revision(self, url, ud, d):
         return ud.revision

bitbake/lib/bb/fetch2/wget.py

@@ -37,7 +37,7 @@ from   bb.fetch2 import runfetchcmd
 
 class Wget(FetchMethod):
     """Class to fetch urls via 'wget'"""
-    def supports(self, ud, d):
+    def supports(self, url, ud, d):
         """
         Check to see if a given url can be fetched with wget.
         """
@@ -58,7 +58,7 @@ class Wget(FetchMethod):
 
         ud.localfile = data.expand(urllib.unquote(ud.basename), d)
 
-    def download(self, ud, d, checkonly = False):
+    def download(self, uri, ud, d, checkonly = False):
         """Fetch urls"""
 
         basecmd = d.getVar("FETCHCMD_wget", True) or "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate"
@@ -76,7 +76,7 @@ class Wget(FetchMethod):
         else:
             fetchcmd = d.getVar("FETCHCOMMAND_wget", True) or d.expand(basecmd + " -P ${DL_DIR} '${URI}'")
 
-        uri = ud.url.split(";")[0]
+        uri = uri.split(";")[0]
 
         fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0])
         fetchcmd = fetchcmd.replace("${FILE}", ud.basename)
@@ -93,5 +93,5 @@ class Wget(FetchMethod):
 
         return True
 
-    def checkstatus(self, ud, d):
-        return self.download(ud, d, True)
+    def checkstatus(self, uri, ud, d):
+        return self.download(uri, ud, d, True)

bitbake/lib/bb/runqueue.py

@@ -98,49 +98,26 @@ class RunQueueScheduler(object):
         """
         self.rq = runqueue
         self.rqdata = rqdata
-        self.numTasks = len(self.rqdata.runq_fnid)
+        numTasks = len(self.rqdata.runq_fnid)
 
         self.prio_map = []
-        self.prio_map.extend(range(self.numTasks))
-
-        self.buildable = []
-        self.stamps = {}
-        for taskid in xrange(self.numTasks):
-            fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[taskid]]
-            taskname = self.rqdata.runq_task[taskid]
-            self.stamps[taskid] = bb.build.stampfile(taskname, self.rqdata.dataCache, fn)
-            if self.rq.runq_buildable[taskid] == 1:
-                self.buildable.append(taskid)
-
-        self.rev_prio_map = None
+        self.prio_map.extend(range(numTasks))
 
     def next_buildable_task(self):
         """
         Return the id of the first task we find that is buildable
         """
-        self.buildable = [x for x in self.buildable if not self.rq.runq_running[x] == 1]
-        if not self.buildable:
-            return None
-        if len(self.buildable) == 1:
-            return self.buildable[0]
-
-        if not self.rev_prio_map:
-            self.rev_prio_map = range(self.numTasks)
-            for taskid in xrange(self.numTasks):
-                self.rev_prio_map[self.prio_map[taskid]] = taskid
-
-        best = None
-        bestprio = None
-        for taskid in self.buildable:
-            prio = self.rev_prio_map[taskid]
-            if not bestprio or bestprio > prio:
-                stamp = self.stamps[taskid]
-                if stamp in self.rq.build_stamps.itervalues():
+        for tasknum in xrange(len(self.rqdata.runq_fnid)):
+            taskid = self.prio_map[tasknum]
+            if self.rq.runq_running[taskid] == 1:
+                continue
+            if self.rq.runq_buildable[taskid] == 1:
+                fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[taskid]]
+                taskname = self.rqdata.runq_task[taskid]
+                stamp = bb.build.stampfile(taskname, self.rqdata.dataCache, fn)
+                if stamp in self.rq.build_stamps.values():
                     continue
-                bestprio = prio
-                best = taskid
-
-        return best
+                return taskid
 
     def next(self):
         """
@@ -149,9 +126,6 @@ class RunQueueScheduler(object):
         if self.rq.stats.active < self.rq.number_tasks:
             return self.next_buildable_task()
 
-    def newbuilable(self, task):
-        self.buildable.append(task)
-
 class RunQueueSchedulerSpeed(RunQueueScheduler):
     """
     A scheduler optimised for speed. The priority map is sorted by task weight,
@@ -163,7 +137,9 @@ class RunQueueSchedulerSpeed(RunQueueScheduler):
         """
         The priority map is sorted by task weight.
         """
-        RunQueueScheduler.__init__(self, runqueue, rqdata)
+
+        self.rq = runqueue
+        self.rqdata = rqdata
 
         sortweight = sorted(copy.deepcopy(self.rqdata.runq_weight))
         copyweight = copy.deepcopy(self.rqdata.runq_weight)
@@ -1140,7 +1116,6 @@ class RunQueueExecute:
         self.runq_complete = []
 
         self.build_stamps = {}
-        self.build_stamps2 = []
         self.failed_fnids = []
 
         self.stampcache = {}
@@ -1153,7 +1128,6 @@ class RunQueueExecute:
 
         # self.build_stamps[pid] may not exist when use shared work directory.
         if task in self.build_stamps:
-            self.build_stamps2.remove(self.build_stamps[task])
             del self.build_stamps[task]
 
         if status != 0:
@@ -1343,10 +1317,6 @@ class RunQueueExecuteTasks(RunQueueExecute):
                     schedulers.add(getattr(module, name))
         return schedulers
 
-    def setbuildable(self, task):
-        self.runq_buildable[task] = 1
-        self.sched.newbuilable(task)
-
     def task_completeoutright(self, task):
         """
         Mark a task as completed
@@ -1364,7 +1334,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
                 if self.runq_complete[dep] != 1:
                     alldeps = 0
             if alldeps == 1:
-                self.setbuildable(revdep)
+                self.runq_buildable[revdep] = 1
                 fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[revdep]]
                 taskname = self.rqdata.runq_task[revdep]
                 logger.debug(1, "Marking task %s (%s, %s) as buildable", revdep, fn, taskname)
@@ -1388,7 +1358,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
 
     def task_skip(self, task, reason):
         self.runq_running[task] = 1
-        self.setbuildable(task)
+        self.runq_buildable[task] = 1
         bb.event.fire(runQueueTaskSkipped(task, self.stats, self.rq, reason), self.cfgData)
         self.task_completeoutright(task)
         self.stats.taskCompleted()
@@ -1437,20 +1407,17 @@ class RunQueueExecuteTasks(RunQueueExecute):
                 startevent = runQueueTaskStarted(task, self.stats, self.rq)
                 bb.event.fire(startevent, self.cfgData)
 
-            taskdepdata = self.build_taskdepdata(task)
-
             taskdep = self.rqdata.dataCache.task_deps[fn]
             if 'fakeroot' in taskdep and taskname in taskdep['fakeroot'] and not self.cooker.configuration.dry_run:
                 if not self.rq.fakeworker:
                     self.rq.start_fakeworker(self)
-                self.rq.fakeworker.stdin.write("<runtask>" + pickle.dumps((fn, task, taskname, False, self.cooker.collection.get_file_appends(fn), taskdepdata)) + "</runtask>")
+                self.rq.fakeworker.stdin.write("<runtask>" + pickle.dumps((fn, task, taskname, False, self.cooker.collection.get_file_appends(fn))) + "</runtask>")
                 self.rq.fakeworker.stdin.flush()
             else:
-                self.rq.worker.stdin.write("<runtask>" + pickle.dumps((fn, task, taskname, False, self.cooker.collection.get_file_appends(fn), taskdepdata)) + "</runtask>")
+                self.rq.worker.stdin.write("<runtask>" + pickle.dumps((fn, task, taskname, False, self.cooker.collection.get_file_appends(fn))) + "</runtask>")
                 self.rq.worker.stdin.flush()
 
             self.build_stamps[task] = bb.build.stampfile(taskname, self.rqdata.dataCache, fn)
-            self.build_stamps2.append(self.build_stamps[task]) 
             self.runq_running[task] = 1
             self.stats.taskActive()
             if self.stats.active < self.number_tasks:
@@ -1476,26 +1443,6 @@ class RunQueueExecuteTasks(RunQueueExecute):
 
         return True
 
-    def build_taskdepdata(self, task):
-        taskdepdata = {}
-        next = self.rqdata.runq_depends[task]
-        next.add(task)
-        while next:
-            additional = []
-            for revdep in next:
-                fn = self.rqdata.taskData.fn_index[self.rqdata.runq_fnid[revdep]]
-                pn = self.rqdata.dataCache.pkg_fn[fn]
-                taskname = self.rqdata.runq_task[revdep]
-                deps = self.rqdata.runq_depends[revdep]
-                taskdepdata[revdep] = [pn, taskname, fn, deps]
-                for revdep2 in deps:
-                    if revdep2 not in taskdepdata:
-                        additional.append(revdep2)
-            next = additional
-
-        #bb.note("Task %s: " % task + str(taskdepdata).replace("], ", "],\n"))
-        return taskdepdata
-
 class RunQueueExecuteScenequeue(RunQueueExecute):
     def __init__(self, rq):
         RunQueueExecute.__init__(self, rq)
@@ -1806,10 +1753,10 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
             if 'fakeroot' in taskdep and taskname in taskdep['fakeroot']:
                 if not self.rq.fakeworker:
                     self.rq.start_fakeworker(self)
-                self.rq.fakeworker.stdin.write("<runtask>" + pickle.dumps((fn, realtask, taskname, True, self.cooker.collection.get_file_appends(fn), None)) + "</runtask>")
+                self.rq.fakeworker.stdin.write("<runtask>" + pickle.dumps((fn, realtask, taskname, True, self.cooker.collection.get_file_appends(fn))) + "</runtask>")
                 self.rq.fakeworker.stdin.flush()
             else:
-                self.rq.worker.stdin.write("<runtask>" + pickle.dumps((fn, realtask, taskname, True, self.cooker.collection.get_file_appends(fn), None)) + "</runtask>")
+                self.rq.worker.stdin.write("<runtask>" + pickle.dumps((fn, realtask, taskname, True, self.cooker.collection.get_file_appends(fn))) + "</runtask>")
                 self.rq.worker.stdin.flush()
 
             self.runq_running[task] = 1

bitbake/lib/bb/server/xmlrpc.py

@@ -198,11 +198,6 @@ class XMLRPCServer(SimpleXMLRPCServer, BaseImplServer):
         Constructor
         """
         BaseImplServer.__init__(self)
-        if (interface[1] == 0):     # anonymous port, not getting reused
-            self.single_use = True
-        # Use auto port configuration
-        if (interface[1] == -1):
-            interface = (interface[0], 0)
         SimpleXMLRPCServer.__init__(self, interface,
                                     requestHandler=BitBakeXMLRPCRequestHandler,
                                     logRequests=False, allow_none=True)
@@ -213,6 +208,8 @@ class XMLRPCServer(SimpleXMLRPCServer, BaseImplServer):
         self.autoregister_all_functions(self.commands, "")
         self.interface = interface
         self.single_use = False
+        if (interface[1] == 0):     # anonymous port, not getting reused
+            self.single_use = True
 
     def addcooker(self, cooker):
         BaseImplServer.addcooker(self, cooker)
@@ -341,38 +338,13 @@ class BitBakeXMLRPCClient(BitBakeBaseServer):
     def saveConnectionDetails(self, remote):
         self.remote = remote
 
-    def saveConnectionConfigParams(self, configParams):
-        self.configParams = configParams
-
     def establishConnection(self, featureset):
         # The format of "remote" must be "server:port"
         try:
             [host, port] = self.remote.split(":")
             port = int(port)
-        except Exception as e:
-            bb.fatal("Failed to read remote definition (%s)" % str(e))
-
-        # use automatic port if port set to -1, meaning read it from
-        # the bitbake.lock file
-        if port == -1:
-            lock_location = "%s/bitbake.lock" % self.configParams.environment.get('BUILDDIR')
-            lock = bb.utils.lockfile(lock_location, False, False)
-            if lock:
-                # This means there is no server running which we can
-                # connect to on the local system.
-                bb.utils.unlockfile(lock)
-                return None
-
-            try:
-                lf = open(lock_location, 'r')
-                remotedef = lf.readline()
-                [host, port] = remotedef.split(":")
-                port = int(port)
-                lf.close()
-                self.remote = remotedef
-            except Exception as e:
-                bb.fatal("Failed to read bitbake.lock (%s)" % str(e))
-
+        except:
+            return None
         # We need our IP for the server connection. We get the IP
         # by trying to connect with the server
         try:
@@ -380,8 +352,8 @@ class BitBakeXMLRPCClient(BitBakeBaseServer):
             s.connect((host, port))
             ip = s.getsockname()[0]
             s.close()
-        except Exception as e:
-            bb.fatal("Could not create socket for %s:%s (%s)" % (host, port, str(e)))
+        except:
+            return None
         try:
             self.serverImpl = XMLRPCProxyServer(host, port)
             self.connection = BitBakeXMLRPCServerConnection(self.serverImpl, (ip, 0), self.observer_only, featureset)

bitbake/lib/bb/siggen.py

@@ -224,7 +224,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
 
         if runtime and k in self.taskhash:
             data['runtaskdeps'] = self.runtaskdeps[k]
-            data['file_checksum_values'] = [(os.path.basename(f), cs) for f,cs in self.file_checksum_values[k].items()]
+            data['file_checksum_values'] = self.file_checksum_values[k]
             data['runtaskhashes'] = {}
             for dep in data['runtaskdeps']:
                 data['runtaskhashes'][dep] = self.taskhash[dep]
@@ -322,39 +322,6 @@ def compare_sigfiles(a, b, recursecb = None):
         removed = sb - sa
         return changed, added, removed
 
-    def file_checksums_diff(a, b):
-        from collections import Counter
-        # Handle old siginfo format
-        if isinstance(a, dict):
-            a = [(os.path.basename(f), cs) for f, cs in a.items()]
-        if isinstance(b, dict):
-            b = [(os.path.basename(f), cs) for f, cs in b.items()]
-        # Compare lists, ensuring we can handle duplicate filenames if they exist
-        removedcount = Counter(a)
-        removedcount.subtract(b)
-        addedcount = Counter(b)
-        addedcount.subtract(a)
-        added = []
-        for x in b:
-            if addedcount[x] > 0:
-                addedcount[x] -= 1
-                added.append(x)
-        removed = []
-        changed = []
-        for x in a:
-            if removedcount[x] > 0:
-                removedcount[x] -= 1
-                for y in added:
-                    if y[0] == x[0]:
-                        changed.append((x[0], x[1], y[1]))
-                        added.remove(y)
-                        break
-                else:
-                    removed.append(x)
-        added = [x[0] for x in added]
-        removed = [x[0] for x in removed]
-        return changed, added, removed
-
     if 'basewhitelist' in a_data and a_data['basewhitelist'] != b_data['basewhitelist']:
         output.append("basewhitelist changed from '%s' to '%s'" % (a_data['basewhitelist'], b_data['basewhitelist']))
         if a_data['basewhitelist'] and b_data['basewhitelist']:
@@ -390,10 +357,10 @@ def compare_sigfiles(a, b, recursecb = None):
         for dep in changed:
             output.append("Variable %s value changed from '%s' to '%s'" % (dep, a_data['varvals'][dep], b_data['varvals'][dep]))
 
-    changed, added, removed = file_checksums_diff(a_data['file_checksum_values'], b_data['file_checksum_values'])
+    changed, added, removed = dict_diff(a_data['file_checksum_values'], b_data['file_checksum_values'])
     if changed:
-        for f, old, new in changed:
-            output.append("Checksum for file %s changed from %s to %s" % (f, old, new))
+        for f in changed:
+            output.append("Checksum for file %s changed from %s to %s" % (f, a_data['file_checksum_values'][f], b_data['file_checksum_values'][f]))
     if added:
         for f in added:
             output.append("Dependency on checksum of file %s was added" % (f))

bitbake/lib/bb/tests/fetch.py

@@ -407,7 +407,8 @@ class URLHandle(unittest.TestCase):
     datatable = {
        "http://www.google.com/index.html" : ('http', 'www.google.com', '/index.html', '', '', {}),
        "cvs://anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', '', {'module': 'familiar/dist/ipkg'}),
-       "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'})
+       "cvs://anoncvs:anonymous@cvs.handhelds.org/cvs;tag=V0-99-81;module=familiar/dist/ipkg" : ('cvs', 'cvs.handhelds.org', '/cvs', 'anoncvs', 'anonymous', {'tag': 'V0-99-81', 'module': 'familiar/dist/ipkg'}),
+       "git://git.openembedded.org/bitbake;branch=@foo" : ('git', 'git.openembedded.org', '/bitbake', '', '', {'branch': '@foo'})
     }
 
     def test_decodeurl(self):

bitbake/lib/bb/ui/buildinfohelper.py

@@ -1,738 +0,0 @@
-#
-# BitBake ToasterUI Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import datetime
-import sys
-import bb
-import re
-import subprocess
-
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "toaster.toastermain.settings")
-
-import toaster.toastermain.settings as toaster_django_settings
-from toaster.orm.models import Build, Task, Recipe, Layer_Version, Layer, Target, LogMessage
-from toaster.orm.models import Variable, VariableHistory
-from toaster.orm.models import Target_Package, Build_Package, Build_File
-from toaster.orm.models import Task_Dependency, Build_Package_Dependency
-from toaster.orm.models import Target_Package_Dependency, Recipe_Dependency
-from bb.msg import BBLogFormatter as format
-
-class ORMWrapper(object):
-    """ This class creates the dictionaries needed to store information in the database
-        following the format defined by the Django models. It is also used to save this
-        information in the database.
-    """
-
-    def __init__(self):
-        pass
-
-
-    def create_build_object(self, build_info):
-
-        build = Build.objects.create(
-                                    machine=build_info['machine'],
-                                    image_fstypes=build_info['image_fstypes'],
-                                    distro=build_info['distro'],
-                                    distro_version=build_info['distro_version'],
-                                    started_on=build_info['started_on'],
-                                    completed_on=build_info['completed_on'],
-                                    cooker_log_path=build_info['cooker_log_path'],
-                                    build_name=build_info['build_name'],
-                                    bitbake_version=build_info['bitbake_version'])
-
-        return build
-
-    def create_target_objects(self, target_info):
-        targets = []
-        for tgt_name in target_info['targets']:
-            tgt_object = Target.objects.create( build = target_info['build'],
-                                    target = tgt_name,
-                                    is_image = False,
-                                    file_name = "",
-                                    file_size = 0);
-            targets.append(tgt_object)
-        return targets
-
-    def update_build_object(self, build, errors, warnings, taskfailures):
-
-        outcome = Build.SUCCEEDED
-        if errors or taskfailures:
-            outcome = Build.FAILED
-
-        build.completed_on = datetime.datetime.now()
-        build.errors_no = errors
-        build.warnings_no = warnings
-        build.outcome = outcome
-        build.save()
-
-
-    def get_update_task_object(self, task_information):
-        task_object, created = Task.objects.get_or_create(
-                                build=task_information['build'],
-                                recipe=task_information['recipe'],
-                                task_name=task_information['task_name'],
-                                )
-
-        for v in vars(task_object):
-            if v in task_information.keys():
-                vars(task_object)[v] = task_information[v]
-        # if we got covered by a setscene task, we're SSTATE
-        if task_object.outcome == Task.OUTCOME_COVERED and 1 == Task.objects.filter(task_executed=True, build = task_object.build, recipe = task_object.recipe, task_name=task_object.task_name+"_setscene").count():
-            task_object.outcome = Task.OUTCOME_SSTATE
-            outcome_task_setscene = Task.objects.get(task_executed=True, build = task_object.build,
-                                    recipe = task_object.recipe, task_name=task_object.task_name+"_setscene").outcome
-            if outcome_task_setscene == Task.OUTCOME_SUCCESS:
-                task_object.sstate_result = Task.SSTATE_RESTORED
-            elif outcome_task_setscene == Task.OUTCOME_FAILED:
-                task_object.sstate_result = Task.SSTATE_FAILED
-
-        # mark down duration if we have a start time
-        if 'start_time' in task_information.keys():
-            duration = datetime.datetime.now() - task_information['start_time']
-            task_object.elapsed_time = duration.total_seconds()
-
-        task_object.save()
-        return task_object
-
-
-    def get_update_recipe_object(self, recipe_information):
-
-        recipe_object, created = Recipe.objects.get_or_create(
-                                         layer_version=recipe_information['layer_version'],
-                                         file_path=recipe_information['file_path'])
-
-        for v in vars(recipe_object):
-            if v in recipe_information.keys():
-                vars(recipe_object)[v] = recipe_information[v]
-
-        recipe_object.save()
-
-        return recipe_object
-
-    def get_layer_version_object(self, layer_version_information):
-
-        layer_version_object = Layer_Version.objects.get_or_create(
-                                    layer = layer_version_information['layer'],
-                                    branch = layer_version_information['branch'],
-                                    commit = layer_version_information['commit'],
-                                    priority = layer_version_information['priority']
-                                    )
-
-        layer_version_object[0].save()
-
-        return layer_version_object[0]
-
-    def get_update_layer_object(self, layer_information):
-
-        layer_object = Layer.objects.get_or_create(
-                                name=layer_information['name'],
-                                local_path=layer_information['local_path'],
-                                layer_index_url=layer_information['layer_index_url'])
-        layer_object[0].save()
-
-        return layer_object[0]
-
-
-    def save_target_package_information(self, target_obj, packagedict, bldpkgs, recipes):
-        for p in packagedict:
-            packagedict[p]['object'] = Target_Package.objects.create( target = target_obj,
-                                        name = p,
-                                        size = packagedict[p]['size'])
-            if p in bldpkgs:
-                packagedict[p]['object'].version = bldpkgs[p]['version']
-                packagedict[p]['object'].recipe =  recipes[bldpkgs[p]['pn']]
-                packagedict[p]['object'].save()
-
-        for p in packagedict:
-            for (px,deptype) in packagedict[p]['depends']:
-                Target_Package_Dependency.objects.create( package = packagedict[p]['object'],
-                                        depends_on = packagedict[px]['object'],
-                                        dep_type = deptype);
-
-
-    def create_logmessage(self, log_information):
-        log_object = LogMessage.objects.create(
-                        build = log_information['build'],
-                        level = log_information['level'],
-                        message = log_information['message'])
-
-        for v in vars(log_object):
-            if v in log_information.keys():
-                vars(log_object)[v] = log_information[v]
-
-        return log_object.save()
-
-
-    def save_build_package_information(self, build_obj, package_info, recipes):
-        # create and save the object
-        bp_object = Build_Package.objects.create( build = build_obj,
-                                       recipe = recipes[package_info['PN']],
-                                       name = package_info['PKG'],
-                                       version = package_info['PKGV'],
-                                       revision = package_info['PKGR'],
-                                       summary = package_info['SUMMARY'],
-                                       description = package_info['DESCRIPTION'],
-                                       size = int(package_info['PKGSIZE']),
-                                       section = package_info['SECTION'],
-                                       license = package_info['LICENSE'],
-                                       )
-        # save any attached file information
-        for path in package_info['FILES_INFO']:
-                fo = Build_File.objects.create( bpackage = bp_object,
-                                        path = path,
-                                        size = package_info['FILES_INFO'][path] )
-
-        # save soft dependency information
-        if 'RDEPENDS' in package_info and package_info['RDEPENDS']:
-            for p in bb.utils.explode_deps(package_info['RDEPENDS']):
-                Build_Package_Dependency.objects.get_or_create( package = bp_object,
-                    depends_on = p, dep_type = Build_Package_Dependency.TYPE_RDEPENDS)
-        if 'RPROVIDES' in package_info and package_info['RPROVIDES']:
-            for p in bb.utils.explode_deps(package_info['RPROVIDES']):
-                Build_Package_Dependency.objects.get_or_create( package = bp_object,
-                    depends_on = p, dep_type = Build_Package_Dependency.TYPE_RPROVIDES)
-        if 'RRECOMMENDS' in package_info and package_info['RRECOMMENDS']:
-            for p in bb.utils.explode_deps(package_info['RRECOMMENDS']):
-                Build_Package_Dependency.objects.get_or_create( package = bp_object,
-                    depends_on = p, dep_type = Build_Package_Dependency.TYPE_RRECOMMENDS)
-        if 'RSUGGESTS' in package_info and package_info['RSUGGESTS']:
-            for p in bb.utils.explode_deps(package_info['RSUGGESTS']):
-                Build_Package_Dependency.objects.get_or_create( package = bp_object,
-                    depends_on = p, dep_type = Build_Package_Dependency.TYPE_RSUGGESTS)
-        if 'RREPLACES' in package_info and package_info['RREPLACES']:
-            for p in bb.utils.explode_deps(package_info['RREPLACES']):
-                Build_Package_Dependency.objects.get_or_create( package = bp_object,
-                    depends_on = p, dep_type = Build_Package_Dependency.TYPE_RREPLACES)
-        if 'RCONFLICTS' in package_info and package_info['RCONFLICTS']:
-            for p in bb.utils.explode_deps(package_info['RCONFLICTS']):
-                Build_Package_Dependency.objects.get_or_create( package = bp_object,
-                    depends_on = p, dep_type = Build_Package_Dependency.TYPE_RCONFLICTS)
-
-        return bp_object
-
-    def save_build_variables(self, build_obj, vardump):
-        for k in vardump:
-            if not bool(vardump[k]['func']):
-                value = vardump[k]['v'];
-                if value is None:
-                    value = ''
-                desc = vardump[k]['doc'];
-                if desc is None:
-                    var_words = [word for word in k.split('_')]
-                    root_var = "_".join([word for word in var_words if word.isupper()])
-                    if root_var and root_var != k and root_var in vardump:
-                        desc = vardump[root_var]['doc']
-                if desc is None:
-                    desc = ''
-                variable_obj = Variable.objects.create( build = build_obj,
-                    variable_name = k,
-                    variable_value = value,
-                    description = desc)
-                for vh in vardump[k]['history']:
-                    VariableHistory.objects.create( variable = variable_obj,
-                            file_name = vh['file'],
-                            line_number = vh['line'],
-                            operation = vh['op'])
-
-class BuildInfoHelper(object):
-    """ This class gathers the build information from the server and sends it
-        towards the ORM wrapper for storing in the database
-        It is instantiated once per build
-        Keeps in memory all data that needs matching before writing it to the database
-    """
-
-    def __init__(self, server, has_build_history = False):
-        self._configure_django()
-        self.internal_state = {}
-        self.task_order = 0
-        self.server = server
-        self.orm_wrapper = ORMWrapper()
-        self.has_build_history = has_build_history
-        self.tmp_dir = self.server.runCommand(["getVariable", "TMPDIR"])[0]
-
-    def _configure_django(self):
-        # Add toaster to sys path for importing modules
-        sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'toaster'))
-
-    ###################
-    ## methods to convert event/external info into objects that the ORM layer uses
-
-    def _get_layer_dict(self, layer_path):
-
-        layer_info = {}
-        layer_name = layer_path.split('/')[-1]
-        layer_url = 'http://layers.openembedded.org/layerindex/layer/{layer}/'
-        layer_url_name = self._get_url_map_name(layer_name)
-
-        layer_info['name'] = layer_name
-        layer_info['local_path'] = layer_path
-        layer_info['layer_index_url'] = layer_url.format(layer=layer_url_name)
-
-        return layer_info
-
-    def _get_url_map_name(self, layer_name):
-        """ Some layers have a different name on openembedded.org site,
-            this method returns the correct name to use in the URL
-        """
-
-        url_name = layer_name
-        url_mapping = {'meta': 'openembedded-core'}
-
-        for key in url_mapping.keys():
-            if key == layer_name:
-                url_name = url_mapping[key]
-
-        return url_name
-
-    def _get_layer_information(self):
-
-        layer_info = {}
-
-        return layer_info
-
-    def _get_layer_version_information(self, layer_object):
-
-        layer_version_info = {}
-        layer_version_info['build'] = self.internal_state['build']
-        layer_version_info['layer'] = layer_object
-        layer_version_info['branch'] = self._get_git_branch(layer_object.local_path)
-        layer_version_info['commit'] = self._get_git_revision(layer_object.local_path)
-        layer_version_info['priority'] = 0
-
-        return layer_version_info
-
-
-    def _get_git_branch(self, layer_path):
-        branch = subprocess.Popen("git symbolic-ref HEAD 2>/dev/null ", cwd=layer_path, shell=True, stdout=subprocess.PIPE).communicate()[0]
-        branch = branch.replace('refs/heads/', '').rstrip()
-        return branch
-
-    def _get_git_revision(self, layer_path):
-        revision = subprocess.Popen("git rev-parse HEAD 2>/dev/null ", cwd=layer_path, shell=True, stdout=subprocess.PIPE).communicate()[0].rstrip()
-        return revision
-
-
-    def _get_build_information(self):
-        build_info = {}
-        # Generate an identifier for each new build
-
-        build_info['machine'] = self.server.runCommand(["getVariable", "MACHINE"])[0]
-        build_info['distro'] = self.server.runCommand(["getVariable", "DISTRO"])[0]
-        build_info['distro_version'] = self.server.runCommand(["getVariable", "DISTRO_VERSION"])[0]
-        build_info['started_on'] = datetime.datetime.now()
-        build_info['completed_on'] = datetime.datetime.now()
-        build_info['image_fstypes'] = self._remove_redundant(self.server.runCommand(["getVariable", "IMAGE_FSTYPES"])[0] or "")
-        build_info['cooker_log_path'] = self.server.runCommand(["getVariable", "BB_CONSOLELOG"])[0]
-        build_info['build_name'] = self.server.runCommand(["getVariable", "BUILDNAME"])[0]
-        build_info['bitbake_version'] = self.server.runCommand(["getVariable", "BB_VERSION"])[0]
-
-        return build_info
-
-    def _get_task_information(self, event, recipe):
-
-
-        task_information = {}
-        task_information['build'] = self.internal_state['build']
-        task_information['outcome'] = Task.OUTCOME_NA
-        task_information['recipe'] = recipe
-        task_information['task_name'] = event.taskname
-        try:
-            # some tasks don't come with a hash. and that's ok
-            task_information['sstate_checksum'] = event.taskhash
-        except AttributeError:
-            pass
-        return task_information
-
-    def _get_layer_version_for_path(self, path):
-        def _slkey(layer_version):
-            return len(layer_version.layer.local_path)
-
-        # Heuristics: we always match recipe to the deepest layer path that
-        # we can match to the recipe file path
-        for bl in sorted(self.internal_state['layer_versions'], reverse=True, key=_slkey):
-            if (path.startswith(bl.layer.local_path)):
-                return bl
-
-        #TODO: if we get here, we didn't read layers correctly
-        assert False
-        return None
-
-    def _get_recipe_information_from_build_event(self, event):
-
-        layer_version_obj = self._get_layer_version_for_path(re.split(':', event.taskfile)[-1])
-
-        recipe_info = {}
-        recipe_info['layer_version'] = layer_version_obj
-        recipe_info['file_path'] = re.split(':', event.taskfile)[-1]
-
-        return recipe_info
-
-    def _get_task_build_stats(self, task_object):
-        bs_path = self._get_path_information(task_object)
-        for bp in bs_path:  # TODO: split for each target
-            task_build_stats = self._get_build_stats_from_file(bp, task_object.task_name)
-
-        return task_build_stats
-
-    def _get_path_information(self, task_object):
-        build_stats_format = "{tmpdir}/buildstats/{target}-{machine}/{buildname}/{package}/"
-        build_stats_path = []
-
-        for t in self.internal_state['targets']:
-            target = t.target
-            machine = self.internal_state['build'].machine
-            buildname = self.internal_state['build'].build_name
-            pe, pv = task_object.recipe.version.split(":",1)
-            if len(pe) > 0:
-                package = task_object.recipe.name + "-" + pe + "_" + pv
-            else:
-                package = task_object.recipe.name + "-" + pv
-
-            build_stats_path.append(build_stats_format.format(tmpdir=self.tmp_dir, target=target,
-                                                     machine=machine, buildname=buildname,
-                                                     package=package))
-
-        return build_stats_path
-
-    def _get_build_stats_from_file(self, bs_path, task_name):
-
-        task_bs_filename = str(bs_path) + str(task_name)
-        task_bs = open(task_bs_filename, 'r')
-
-        cpu_usage = 0
-        disk_io = 0
-        startio = ''
-        endio = ''
-
-        for line in task_bs.readlines():
-            if line.startswith('CPU usage: '):
-                cpu_usage = line[11:]
-            elif line.startswith('EndTimeIO: '):
-                endio = line[11:]
-            elif line.startswith('StartTimeIO: '):
-                startio = line[13:]
-
-        task_bs.close()
-
-        if startio and endio:
-            disk_io = int(endio.strip('\n ')) - int(startio.strip('\n '))
-
-        if cpu_usage:
-            cpu_usage = float(cpu_usage.strip('% \n'))
-
-        task_build_stats = {'cpu_usage': cpu_usage, 'disk_io': disk_io}
-
-        return task_build_stats
-
-    def _remove_redundant(self, string):
-        ret = []
-        for i in string.split():
-            if i not in ret:
-                ret.append(i)
-        return " ".join(ret)
-
-
-    ################################
-    ## external available methods to store information
-
-    def store_layer_info(self):
-        layers = self.server.runCommand(["getVariable", "BBLAYERS"])[0].strip().split(" ")
-        self.internal_state['layers'] = []
-        for layer_path in { l for l in layers if len(l) }:
-            layer_information = self._get_layer_dict(layer_path)
-            self.internal_state['layers'].append(self.orm_wrapper.get_update_layer_object(layer_information))
-
-    def store_started_build(self, event):
-
-        build_information = self._get_build_information()
-
-        build_obj = self.orm_wrapper.create_build_object(build_information)
-        self.internal_state['build'] = build_obj
-
-        # create target information
-        target_information = {}
-        target_information['targets'] = event.getPkgs()
-        target_information['build'] = build_obj
-
-        self.internal_state['targets'] = self.orm_wrapper.create_target_objects(target_information)
-
-        # Load layer information for the build
-        self.internal_state['layer_versions'] = []
-        for layer_object in self.internal_state['layers']:
-            layer_version_information = self._get_layer_version_information(layer_object)
-            self.internal_state['layer_versions'].append(self.orm_wrapper.get_layer_version_object(layer_version_information))
-
-        del self.internal_state['layers']
-        # Save build configuration
-        self.orm_wrapper.save_build_variables(build_obj, self.server.runCommand(["getAllKeysWithFlags", ["doc", "func"]])[0])
-
-
-    def update_build_information(self, event, errors, warnings, taskfailures):
-        if 'build' in self.internal_state:
-            self.orm_wrapper.update_build_object(self.internal_state['build'], errors, warnings, taskfailures)
-
-    def store_started_task(self, event):
-        identifier = event.taskfile + event.taskname
-
-        recipe_information = self._get_recipe_information_from_build_event(event)
-        recipe = self.orm_wrapper.get_update_recipe_object(recipe_information)
-
-        task_information = self._get_task_information(event, recipe)
-        task_information['outcome'] = Task.OUTCOME_NA
-
-        if isinstance(event, bb.runqueue.runQueueTaskSkipped):
-            task_information['task_executed'] = False
-            if event.reason == "covered":
-                task_information['outcome'] = Task.OUTCOME_COVERED
-            if event.reason == "existing":
-                task_information['outcome'] = Task.OUTCOME_EXISTING
-        else:
-            task_information['task_executed'] = True
-            if 'noexec' in vars(event) and event.noexec == True:
-                task_information['script_type'] = Task.CODING_NOEXEC
-
-        self.task_order += 1
-        task_information['order'] = self.task_order
-        task_obj = self.orm_wrapper.get_update_task_object(task_information)
-
-        self.internal_state[identifier] = {'start_time': datetime.datetime.now()}
-
-    def update_and_store_task(self, event):
-        identifier = event.taskfile + event.taskname
-        recipe_information = self._get_recipe_information_from_build_event(event)
-        recipe = self.orm_wrapper.get_update_recipe_object(recipe_information)
-        task_information = self._get_task_information(event,recipe)
-        try:
-            task_information['start_time'] = self.internal_state[identifier]['start_time']
-        except:
-            pass
-
-        if 'logfile' in vars(event):
-            task_information['logfile'] = event.logfile
-
-        if '_message' in vars(event):
-            task_information['message'] = event._message
-
-        if 'taskflags' in vars(event):
-            # with TaskStarted, we get even more information
-            if 'python' in event.taskflags.keys() and event.taskflags['python'] == '1':
-                task_information['script_type'] = Task.CODING_PYTHON
-            else:
-                task_information['script_type'] = Task.CODING_SHELL
-
-        if isinstance(event, (bb.runqueue.runQueueTaskCompleted, bb.runqueue.sceneQueueTaskCompleted)):
-            task_information['outcome'] = Task.OUTCOME_SUCCESS
-            task_build_stats = self._get_task_build_stats(self.orm_wrapper.get_update_task_object(task_information))
-            task_information['cpu_usage'] = task_build_stats['cpu_usage']
-            task_information['disk_io'] = task_build_stats['disk_io']
-            del self.internal_state[identifier]
-
-        if isinstance(event, (bb.runqueue.runQueueTaskFailed, bb.runqueue.sceneQueueTaskFailed)):
-            task_information['outcome'] = Task.OUTCOME_FAILED
-            del self.internal_state[identifier]
-
-        self.orm_wrapper.get_update_task_object(task_information)
-
-
-    def read_target_package_dep_data(self, event):
-        # for all targets
-        for target in self.internal_state['targets']:
-            # verify that we have something to read
-            if not target.is_image or not self.has_build_history:
-                print "not collecting package info ", target.is_image, self.has_build_history
-                break
-
-            # TODO this is a temporary replication of the code in buildhistory.bbclass
-            # This MUST be changed to query the actual BUILD_DIR_IMAGE in the target context when
-            # the capability will be implemented in Bitbake
-
-            MACHINE_ARCH, error = self.server.runCommand(['getVariable', 'MACHINE_ARCH'])
-            TCLIBC, error = self.server.runCommand(['getVariable', 'TCLIBC'])
-            BUILDHISTORY_DIR, error = self.server.runCommand(['getVariable', 'BUILDHISTORY_DIR'])
-            BUILDHISTORY_DIR_IMAGE = "%s/images/%s/%s/%s" % (BUILDHISTORY_DIR, MACHINE_ARCH, TCLIBC, target.target)
-
-            self.internal_state['packages'] = {}
-
-            with open("%s/installed-package-sizes.txt" % BUILDHISTORY_DIR_IMAGE, "r") as fin:
-                for line in fin:
-                    line = line.rstrip(";")
-                    psize, px = line.split("\t")
-                    punit, pname = px.split(" ")
-                    self.internal_state['packages'][pname.strip()] = {'size':int(psize)*1024, 'depends' : []}
-
-            with open("%s/depends.dot" % BUILDHISTORY_DIR_IMAGE, "r") as fin:
-                p = re.compile(r' -> ')
-                dot = re.compile(r'.*style=dotted')
-                for line in fin:
-                    line = line.rstrip(';')
-                    linesplit = p.split(line)
-                    if len(linesplit) == 2:
-                        pname = linesplit[0].rstrip('"').strip('"')
-                        dependsname = linesplit[1].split(" ")[0].strip().strip(";").strip('"').rstrip('"')
-                        deptype = Target_Package_Dependency.TYPE_DEPENDS
-                        if dot.match(line):
-                            deptype = Target_Package_Dependency.TYPE_RECOMMENDS
-                        if not pname in self.internal_state['packages']:
-                            self.internal_state['packages'][pname] = {'size': 0, 'depends' : []}
-                        if not dependsname in self.internal_state['packages']:
-                            self.internal_state['packages'][dependsname] = {'size': 0, 'depends' : []}
-                        self.internal_state['packages'][pname]['depends'].append((dependsname, deptype))
-
-            self.orm_wrapper.save_target_package_information(target,
-                        self.internal_state['packages'],
-                        self.internal_state['bldpkgs'], self.internal_state['recipes'])
-
-
-    def store_dependency_information(self, event):
-        # save layer version priorities
-        if 'layer-priorities' in event._depgraph.keys():
-            for lv in event._depgraph['layer-priorities']:
-                (name, path, regexp, priority) = lv
-                layer_version_obj = self._get_layer_version_for_path(path[1:]) # paths start with a ^
-                assert layer_version_obj is not None
-                layer_version_obj.priority = priority
-                layer_version_obj.save()
-
-        # save build time package information
-        self.internal_state['bldpkgs'] = {}
-        for pkg  in event._depgraph['packages']:
-            self.internal_state['bldpkgs'][pkg] = event._depgraph['packages'][pkg]
-
-        # save recipe information
-        self.internal_state['recipes'] = {}
-        for pn in event._depgraph['pn']:
-
-            file_name = re.split(':', event._depgraph['pn'][pn]['filename'])[-1]
-            layer_version_obj = self._get_layer_version_for_path(re.split(':', file_name)[-1])
-
-            assert layer_version_obj is not None
-
-            recipe_info = {}
-            recipe_info['name'] = pn
-            recipe_info['version'] = event._depgraph['pn'][pn]['version']
-            recipe_info['layer_version'] = layer_version_obj
-            recipe_info['summary'] = event._depgraph['pn'][pn]['summary']
-            recipe_info['license'] = event._depgraph['pn'][pn]['license']
-            recipe_info['description'] = event._depgraph['pn'][pn]['description']
-            recipe_info['section'] = event._depgraph['pn'][pn]['section']
-            recipe_info['licensing_info'] = 'Not Available'
-            recipe_info['homepage'] = event._depgraph['pn'][pn]['homepage']
-            recipe_info['bugtracker'] = event._depgraph['pn'][pn]['bugtracker']
-            recipe_info['file_path'] = file_name
-            recipe = self.orm_wrapper.get_update_recipe_object(recipe_info)
-            if 'inherits' in event._depgraph['pn'][pn].keys():
-                recipe.is_image = True in map(lambda x: x.endswith('image.bbclass'), event._depgraph['pn'][pn]['inherits'])
-            else:
-                recipe.is_image = False
-            if recipe.is_image:
-                for t in self.internal_state['targets']:
-                    if pn == t.target:
-                        t.is_image = True
-                        t.save()
-            self.internal_state['recipes'][pn] = recipe
-
-        # save recipe dependency
-        # buildtime
-        for recipe in event._depgraph['depends']:
-            try:
-                target = self.internal_state['recipes'][recipe]
-                for dep in event._depgraph['depends'][recipe]:
-                    dependency = self.internal_state['recipes'][dep]
-                    Recipe_Dependency.objects.get_or_create( recipe = target,
-                            depends_on = dependency, dep_type = Recipe_Dependency.TYPE_DEPENDS)
-            except KeyError:    # we'll not get recipes for key w/ values listed in ASSUME_PROVIDED
-                pass
-
-        # runtime
-        for recipe in event._depgraph['rdepends-pn']:
-            try:
-                target = self.internal_state['recipes'][recipe]
-                for dep in event._depgraph['rdepends-pn'][recipe]:
-                    dependency = self.internal_state['recipes'][dep]
-                    Recipe_Dependency.objects.get_or_create( recipe = target,
-                            depends_on = dependency, dep_type = Recipe_Dependency.TYPE_RDEPENDS)
-
-            except KeyError:    # we'll not get recipes for key w/ values listed in ASSUME_PROVIDED
-                pass
-
-        # save all task information
-        def _save_a_task(taskdesc):
-            spec = re.split(r'\.', taskdesc);
-            pn = ".".join(spec[0:-1])
-            taskname = spec[-1]
-            e = event
-            e.taskname = pn
-            recipe = self.internal_state['recipes'][pn]
-            task_info = self._get_task_information(e, recipe)
-            task_info['task_name'] = taskname
-            task_obj = self.orm_wrapper.get_update_task_object(task_info)
-            return task_obj
-
-        for taskdesc in event._depgraph['tdepends']:
-            target = _save_a_task(taskdesc)
-            for taskdesc1 in event._depgraph['tdepends'][taskdesc]:
-                dep = _save_a_task(taskdesc1)
-                Task_Dependency.objects.get_or_create( task = target, depends_on = dep )
-
-    def store_build_package_information(self, event):
-        package_info = event.data
-        self.orm_wrapper.save_build_package_information(self.internal_state['build'],
-                            package_info,
-                            self.internal_state['recipes'],
-                            )
-
-    def _store_log_information(self, level, text):
-        log_information = {}
-        log_information['build'] = self.internal_state['build']
-        log_information['level'] = level
-        log_information['message'] = text
-        self.orm_wrapper.create_logmessage(log_information)
-
-    def store_log_info(self, text):
-        self._store_log_information(LogMessage.INFO, text)
-
-    def store_log_warn(self, text):
-        self._store_log_information(LogMessage.WARNING, text)
-
-    def store_log_error(self, text):
-        self._store_log_information(LogMessage.ERROR, text)
-
-    def store_log_event(self, event):
-        # look up license files info from insane.bbclass
-        m = re.match("([^:]*): md5 checksum matched for ([^;]*)", event.msg)
-        if m:
-            (pn, fn) = m.groups()
-            self.internal_state['recipes'][pn].licensing_info = fn
-            self.internal_state['recipes'][pn].save()
-
-        if event.levelno < format.WARNING:
-            return
-        if not 'build' in self.internal_state:
-            return
-        log_information = {}
-        log_information['build'] = self.internal_state['build']
-        if event.levelno >= format.ERROR:
-            log_information['level'] = LogMessage.ERROR
-        elif event.levelno == format.WARNING:
-            log_information['level'] = LogMessage.WARNING
-        log_information['message'] = event.msg
-        log_information['pathname'] = event.pathname
-        log_information['lineno'] = event.lineno
-        self.orm_wrapper.create_logmessage(log_information)
-

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

@@ -185,7 +185,6 @@ class BuildDetailsPage (HobPage):
     def show_issues(self):
         self.num_of_issues += 1
         self.notebook.show_indicator_icon("Issues", self.num_of_issues)
-        self.notebook.queue_draw()
 
     def reset_issues(self):
         self.num_of_issues = 0
@@ -424,7 +423,7 @@ class BuildDetailsPage (HobPage):
         if "recipes" in action:
             self.builder.show_recipes()
         elif "packages" in action:
-            self.builder.show_packages()
+            self.builder.show_packages(ask=False)
         elif "image" in action:
             self.builder.show_configuration()
 

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

@@ -704,6 +704,7 @@ class Builder(gtk.Window):
         self.set_user_config_proxies()
 
     def set_user_config(self):
+        self.handler.reset_cooker()
         # set bb layers
         self.handler.set_bblayers(self.configuration.layers)
         # set local configuration
@@ -793,8 +794,8 @@ class Builder(gtk.Window):
                 self.generate_image_async(True)
 
     def show_error_dialog(self, msg):
-        lbl = "<b>Hob found an error</b>"
-        dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_ERROR, msg)
+        lbl = "<b>Hob found an error</b>\n"
+        dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_ERROR, msg)
         button = dialog.add_button("Close", gtk.RESPONSE_OK)
         HobButton.style_button(button)
         response = dialog.run()
@@ -810,9 +811,10 @@ class Builder(gtk.Window):
         dialog.destroy()
 
     def show_network_error_dialog(self):
-        lbl = "<b>Hob cannot connect to the network</b>"
-        msg = msg + "Please check your network connection. If you are using a proxy server, please make sure it is configured correctly."
-        dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_ERROR, msg)
+        lbl = "<b>Hob cannot connect to the network</b>\n"
+        msg = "Please check your network connection. If you are using a proxy server, please make sure it is configured correctly."
+        lbl = lbl + "%s\n\n" % glib.markup_escape_text(msg)
+        dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_ERROR)
         button = dialog.add_button("Close", gtk.RESPONSE_OK)
         HobButton.style_button(button)
         button = dialog.add_button("Proxy settings", gtk.RESPONSE_CANCEL)
@@ -1035,7 +1037,7 @@ class Builder(gtk.Window):
         self.build_failed()
 
     def handler_no_provider_cb(self, running_build, msg):
-        dialog = CrumbsMessageDialog(self, glib.markup_escape_text(msg), gtk.MESSAGE_INFO)
+        dialog = CrumbsMessageDialog(self, glib.markup_escape_text(msg), gtk.STOCK_DIALOG_INFO)
         button = dialog.add_button("Close", gtk.RESPONSE_OK)
         HobButton.style_button(button)
         dialog.run()
@@ -1098,10 +1100,9 @@ class Builder(gtk.Window):
     def build_packages(self):
         _, all_recipes = self.recipe_model.get_selected_recipes()
         if not all_recipes:
-            lbl = "<b>No selections made</b>"
-            msg = "You have not made any selections"
-            msg = msg + " so there isn't anything to bake at this time."
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_INFO, msg)
+            lbl = "<b>No selections made</b>\nYou have not made any selections"
+            lbl = lbl + " so there isn't anything to bake at this time."
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
             button = dialog.add_button("Close", gtk.RESPONSE_OK)
             HobButton.style_button(button)
             dialog.run()
@@ -1112,10 +1113,9 @@ class Builder(gtk.Window):
     def build_image(self):
         selected_packages = self.package_model.get_selected_packages()
         if not selected_packages:      
-            lbl = "<b>No selections made</b>"
-            msg = "You have not made any selections"
-            msg = msg + " so there isn't anything to bake at this time."
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_INFO, msg)
+            lbl = "<b>No selections made</b>\nYou have not made any selections"
+            lbl = lbl + " so there isn't anything to bake at this time."
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
             button = dialog.add_button("Close", gtk.RESPONSE_OK)
             HobButton.style_button(button)
             dialog.run()
@@ -1129,10 +1129,9 @@ class Builder(gtk.Window):
 
         # If no base image and no selected packages don't build anything
         if not (selected_packages or selected_image != self.recipe_model.__custom_image__):
-            lbl = "<b>No selections made</b>"
-            msg = "You have not made any selections"
-            msg = msg + " so there isn't anything to bake at this time."
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_INFO, msg)
+            lbl = "<b>No selections made</b>\nYou have not made any selections"
+            lbl = lbl + " so there isn't anything to bake at this time."
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
             button = dialog.add_button("Close", gtk.RESPONSE_OK)
             HobButton.style_button(button)
             dialog.run()
@@ -1216,9 +1215,8 @@ class Builder(gtk.Window):
         response = dialog.run()
         if response == gtk.RESPONSE_YES:
             if not dialog.image_names:
-                lbl = "<b>No selections made</b>"
-                msg = "You have not made any selections"
-                crumbs_dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_INFO, msg)
+                lbl = "<b>No selections made</b>\nYou have not made any selections"
+                crumbs_dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
                 button = crumbs_dialog.add_button("Close", gtk.RESPONSE_OK)
                 HobButton.style_button(button)
                 crumbs_dialog.run()
@@ -1305,7 +1303,7 @@ class Builder(gtk.Window):
     def deploy_image(self, image_name):
         if not image_name:
             lbl = "<b>Please select an image to deploy.</b>"
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_INFO)
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
             button = dialog.add_button("Close", gtk.RESPONSE_OK)
             HobButton.style_button(button)
             dialog.run()
@@ -1351,8 +1349,8 @@ class Builder(gtk.Window):
 
     def runqemu_image(self, image_name, kernel_name):
         if not image_name or not kernel_name:
-            lbl = "<b>Please select %s to launch in QEMU.</b>" % ("a kernel" if image_name else "an image")
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_INFO)
+            lbl = "<b>Please select an %s to launch in QEMU.</b>" % ("kernel" if image_name else "image")
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
             button = dialog.add_button("Close", gtk.RESPONSE_OK)
             HobButton.style_button(button)
             dialog.run()
@@ -1373,23 +1371,38 @@ class Builder(gtk.Window):
             cmdline += "runqemu " + kernel_path + " " + image_path + "\"\'"
             subprocess.Popen(shlex.split(cmdline))
         else:
-            lbl = "<b>Path error</b>"
-            msg = "One of your paths is wrong,"
-            msg = msg + " please make sure the following paths exist:\n"
-            msg = msg + "image path:" + image_path + "\n"
-            msg = msg + "kernel path:" + kernel_path + "\n"
-            msg = msg + "source environment path:" + source_env_path + "\n"
-            msg = msg + "tmp path: " + tmp_path + "."
-            msg = msg + "You may be missing either xterm or vte for terminal services."
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_ERROR, msg)
+            lbl = "<b>Path error</b>\nOne of your paths is wrong,"
+            lbl = lbl + " please make sure the following paths exist:\n"
+            lbl = lbl + "image path:" + image_path + "\n"
+            lbl = lbl + "kernel path:" + kernel_path + "\n"
+            lbl = lbl + "source environment path:" + source_env_path + "\n"
+            lbl = lbl + "tmp path: " + tmp_path + "."
+            lbl = lbl + "You may be missing either xterm or vte for terminal services."
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_ERROR)
             button = dialog.add_button("Close", gtk.RESPONSE_OK)
             HobButton.style_button(button)
             dialog.run()
             dialog.destroy()
 
-    def show_packages(self):
-        self.package_details_page.refresh_tables()
-        self.switch_page(self.PACKAGE_SELECTION)
+    def show_packages(self, ask=True):
+        _, selected_recipes = self.recipe_model.get_selected_recipes()
+        if selected_recipes and ask:
+            lbl = "<b>Package list may be incomplete!</b>\nDo you want to build selected recipes"
+            lbl = lbl + " to get a full list or just view the existing packages?"
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
+            button = dialog.add_button("View packages", gtk.RESPONSE_NO)
+            HobAltButton.style_button(button)
+            button = dialog.add_button("Build packages", gtk.RESPONSE_YES)
+            HobButton.style_button(button)
+            dialog.set_default_response(gtk.RESPONSE_YES)
+            response = dialog.run()
+            dialog.destroy()
+            if response == gtk.RESPONSE_YES:
+                self.generate_packages_async(True)
+            else:
+                self.switch_page(self.PACKAGE_SELECTION)
+        else:
+            self.switch_page(self.PACKAGE_SELECTION)
 
     def show_recipes(self):
         self.switch_page(self.RECIPE_SELECTION)
@@ -1402,28 +1415,26 @@ class Builder(gtk.Window):
 
     def stop_build(self):
         if self.stopping:
-            lbl = "<b>Force Stop build?</b>"
-            msg = "You've already selected Stop once,"
-            msg = msg + " would you like to 'Force Stop' the build?\n\n"
-            msg = msg + "This will stop the build as quickly as possible but may"
-            msg = msg + " well leave your build directory in an  unusable state"
-            msg = msg + " that requires manual steps to fix."
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_WARNING, msg)
+            lbl = "<b>Force Stop build?</b>\nYou've already selected Stop once,"
+            lbl = lbl + " would you like to 'Force Stop' the build?\n\n"
+            lbl = lbl + "This will stop the build as quickly as possible but may"
+            lbl = lbl + " well leave your build directory in an  unusable state"
+            lbl = lbl + " that requires manual steps to fix.\n"
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING)
             button = dialog.add_button("Cancel", gtk.RESPONSE_CANCEL)
             HobAltButton.style_button(button)
             button = dialog.add_button("Force Stop", gtk.RESPONSE_YES)
             HobButton.style_button(button)
         else:
-            lbl = "<b>Stop build?</b>"
-            msg = "Are you sure you want to stop this"
-            msg = msg + " build?\n\n'Stop' will stop the build as soon as all in"
-            msg = msg + " progress build tasks are finished. However if a"
-            msg = msg + " lengthy compilation phase is in progress this may take"
-            msg = msg + " some time.\n\n"
-            msg = msg + "'Force Stop' will stop the build as quickly as"
-            msg = msg + " possible but may well leave your build directory in an"
-            msg = msg + " unusable state that requires manual steps to fix."
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_WARNING, msg)
+            lbl = "<b>Stop build?</b>\n\nAre you sure you want to stop this"
+            lbl = lbl + " build?\n\n'Stop' will stop the build as soon as all in"
+            lbl = lbl + " progress build tasks are finished. However if a"
+            lbl = lbl + " lengthy compilation phase is in progress this may take"
+            lbl = lbl + " some time.\n\n"
+            lbl = lbl + "'Force Stop' will stop the build as quickly as"
+            lbl = lbl + " possible but may well leave your build directory in an"
+            lbl = lbl + " unusable state that requires manual steps to fix."
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING)
             button = dialog.add_button("Cancel", gtk.RESPONSE_CANCEL)
             HobAltButton.style_button(button)
             button = dialog.add_button("Force stop", gtk.RESPONSE_YES)

bitbake/lib/bb/ui/crumbs/hig/advancedsettingsdialog.py

@@ -183,9 +183,8 @@ class AdvancedSettingsDialog (CrumbsDialog, SettingsUIHelper):
         self.set_save_button_state()
         if self.get_num_checked_image_types() == 0:
             # Show an error dialog
-            lbl = "<b>Select an image type</b>"
-            msg = "You need to select at least one image type."
-            dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_WARNING, msg)
+            lbl = "<b>Select an image type</b>\n\nYou need to select at least one image type."
+            dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING)
             button = dialog.add_button("OK", gtk.RESPONSE_OK)
             HobButton.style_button(button)
             response = dialog.run()

bitbake/lib/bb/ui/crumbs/hig/crumbsmessagedialog.py

@@ -31,28 +31,51 @@ BitBake GUI's
 In summary: spacing = 12px, border-width = 6px
 """
 
-class CrumbsMessageDialog(gtk.MessageDialog):
+class CrumbsMessageDialog(CrumbsDialog):
     """
     A GNOME HIG compliant dialog widget.
     Add buttons with gtk.Dialog.add_button or gtk.Dialog.add_buttons
     """
-    def __init__(self, parent = None, label="", dialog_type = gtk.MESSAGE_QUESTION, msg=""):
-        super(CrumbsMessageDialog, self).__init__(None,
-                                                  gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
-                                                  dialog_type,
-                                                  gtk.BUTTONS_NONE,
-                                                  None)
+    def __init__(self, parent=None, label="", icon=gtk.STOCK_INFO, msg=""):
+        super(CrumbsMessageDialog, self).__init__("", parent, gtk.DIALOG_MODAL)
 
-        self.set_skip_taskbar_hint(False)
+        self.set_border_width(6)
+        self.vbox.set_property("spacing", 12)
+        self.action_area.set_property("spacing", 12)
+        self.action_area.set_property("border-width", 6)
 
-        self.set_markup(label)
+        first_column = gtk.HBox(spacing=12)
+        first_column.set_property("border-width", 6)
+        first_column.show()
+        self.vbox.add(first_column)
 
-        if 0 <= len(msg) < 300:
-            self.format_secondary_markup(msg)
+        self.icon = gtk.Image()
+        # We have our own Info icon which should be used in preference of the stock icon
+        self.icon_chk = HobIconChecker()
+        self.icon.set_from_stock(self.icon_chk.check_stock_icon(icon), gtk.ICON_SIZE_DIALOG)
+        self.icon.set_property("yalign", 0.00)
+        self.icon.show()
+        first_column.pack_start(self.icon, expand=False, fill=True, padding=0)
+        
+        if 0 <= len(msg) < 200:
+            lbl = label + "%s" % glib.markup_escape_text(msg)
+            self.label_short = gtk.Label()
+            self.label_short.set_use_markup(True)
+            self.label_short.set_line_wrap(True)
+            self.label_short.set_markup(lbl)
+            self.label_short.set_property("yalign", 0.00)
+            self.label_short.show()
+            first_column.add(self.label_short)
         else:
-            vbox = self.get_message_area()
-            vbox.set_border_width(1)
-            vbox.set_property("spacing", 12)
+            second_row = gtk.VBox(spacing=12)
+            second_row.set_property("border-width", 6)
+            self.label_long = gtk.Label()
+            self.label_long.set_use_markup(True)
+            self.label_long.set_line_wrap(True)
+            self.label_long.set_markup(label)
+            self.label_long.set_alignment(0.0, 0.0)
+            second_row.pack_start(self.label_long, expand=False, fill=False, padding=0)
+            self.label_long.show()
             self.textWindow = gtk.ScrolledWindow()
             self.textWindow.set_shadow_type(gtk.SHADOW_IN)
             self.textWindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
@@ -66,5 +89,7 @@ class CrumbsMessageDialog(gtk.MessageDialog):
             self.msgView.set_buffer(self.buf)
             self.textWindow.add(self.msgView)
             self.msgView.show()
-            vbox.add(self.textWindow)
+            second_row.add(self.textWindow)
             self.textWindow.show()
+            first_column.add(second_row)
+            second_row.show()

bitbake/lib/bb/ui/crumbs/hig/deployimagedialog.py

@@ -160,7 +160,6 @@ class DeployImageDialog (CrumbsDialog):
     def response_cb(self, dialog, response_id):
         if response_id == gtk.RESPONSE_YES:
             lbl = ''
-            msg = ''
             combo_item = self.usb_combo.get_active_text()
             if combo_item and combo_item != self.__dummy_usb__ and self.image_path:
                 cmdline = bb.ui.crumbs.utils.which_terminal()
@@ -173,18 +172,15 @@ class DeployImageDialog (CrumbsDialog):
                     if int(tmpfile.readline().strip()) == 0:
                         lbl = "<b>Deploy image successfully.</b>"
                     else:
-                        lbl = "<b>Failed to deploy image.</b>"
-                        msg = "Please check image <b>%s</b> exists and USB device <b>%s</b> is writable." % (self.image_path, combo_item)
+                        lbl = "<b>Failed to deploy image.</b>\nPlease check image <b>%s</b> exists and USB device <b>%s</b> is writable." % (self.image_path, combo_item)
                     tmpfile.close()
             else:
                 if not self.image_path:
-                    lbl = "<b>No selection made.</b>"
-                    msg = "You have not selected an image to deploy."
+                    lbl = "<b>No selection made.</b>\nYou have not selected an image to deploy."
                 else:
-                    lbl = "<b>No selection made.</b>"
-                    msg = "You have not selected a USB device."
+                    lbl = "<b>No selection made.</b>\nYou have not selected a USB device."
             if len(lbl):
-                crumbs_dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_INFO, msg)
+                crumbs_dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
                 button = crumbs_dialog.add_button("Close", gtk.RESPONSE_OK)
                 HobButton.style_button(button)
                 crumbs_dialog.run()

bitbake/lib/bb/ui/crumbs/hig/layerselectiondialog.py

@@ -92,8 +92,7 @@ class LayerSelectionDialog (CrumbsDialog):
         path = dialog.get_filename()
         dialog.destroy()
 
-        lbl = "<b>Error</b>"
-        msg = "Unable to load layer <i>%s</i> because " % path
+        lbl = "<b>Error</b>\nUnable to load layer <i>%s</i> because " % path
         if response == gtk.RESPONSE_YES:
             import os
             import os.path
@@ -104,15 +103,15 @@ class LayerSelectionDialog (CrumbsDialog):
                 it = layer_store.iter_next(it)
 
             if not path:
-                msg += "it is an invalid path."
+                lbl += "it is an invalid path."
             elif not os.path.exists(path+"/conf/layer.conf"):
-                msg += "there is no layer.conf inside the directory."
+                lbl += "there is no layer.conf inside the directory."
             elif path in layers:
-                msg += "it is already in loaded layers."
+                lbl += "it is already in loaded layers."
             else:
                 layer_store.append([path])
                 return
-            dialog = CrumbsMessageDialog(parent, lbl, gtk.MESSAGE_ERROR, msg)
+            dialog = CrumbsMessageDialog(parent, lbl)
             dialog.add_button(gtk.STOCK_CLOSE, gtk.RESPONSE_OK)
             response = dialog.run()
             dialog.destroy()
@@ -133,13 +132,12 @@ class LayerSelectionDialog (CrumbsDialog):
         tree_selection.set_mode(gtk.SELECTION_SINGLE)
 
         # Allow enable drag and drop of rows including row move
-        dnd_internal_target = ''
-        dnd_targets = [(dnd_internal_target, gtk.TARGET_SAME_WIDGET, 0)]
         layer_tv.enable_model_drag_source( gtk.gdk.BUTTON1_MASK,
-            dnd_targets,
-            gtk.gdk.ACTION_MOVE)
-        layer_tv.enable_model_drag_dest(dnd_targets,
+            self.TARGETS,
+            gtk.gdk.ACTION_DEFAULT|
             gtk.gdk.ACTION_MOVE)
+        layer_tv.enable_model_drag_dest(self.TARGETS,
+            gtk.gdk.ACTION_DEFAULT)
         layer_tv.connect("drag_data_get", self.drag_data_get_cb)
         layer_tv.connect("drag_data_received", self.drag_data_received_cb)
 

bitbake/lib/bb/ui/crumbs/hig/propertydialog.py

@@ -105,14 +105,13 @@ class PropertyDialog(CrumbsDialog):
                 
         def create_package_visual_elements(self):
 
-                import json
-
                 name = self.properties['name']
                 binb = self.properties['binb']
                 size = self.properties['size']
                 recipe = self.properties['recipe']
-                file_list = json.loads(self.properties['files_list'])
+                file_list = self.properties['files_list']
 
+                file_list = file_list.strip("{}'")
                 files_temp = ''
                 paths_temp = ''
                 files_binb = []
@@ -181,43 +180,58 @@ class PropertyDialog(CrumbsDialog):
 
                 #################################### FILES BROUGHT BY PACKAGES ###################################
 
-                if file_list:
+                if file_list != '':
                 
                         self.textWindow = gtk.ScrolledWindow()
                         self.textWindow.set_shadow_type(gtk.SHADOW_IN)
                         self.textWindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
                         self.textWindow.set_size_request(100, 170)
 
-                        packagefiles_store = gtk.ListStore(str)
+                        sstatemirrors_store = gtk.ListStore(str)
 
-                        self.packagefiles_tv = gtk.TreeView()
-                        self.packagefiles_tv.set_rules_hint(True)
-                        self.packagefiles_tv.set_headers_visible(True)
-                        self.textWindow.add(self.packagefiles_tv)
+                        self.sstatemirrors_tv = gtk.TreeView()
+                        self.sstatemirrors_tv.set_rules_hint(True)
+                        self.sstatemirrors_tv.set_headers_visible(True)
+                        self.textWindow.add(self.sstatemirrors_tv)
 
                         self.cell1 = gtk.CellRendererText()
                         col1 = gtk.TreeViewColumn('Package files', self.cell1)
                         col1.set_cell_data_func(self.cell1, self.regex_field)
-                        self.packagefiles_tv.append_column(col1)
+                        self.sstatemirrors_tv.append_column(col1)
 
-                        items = file_list.keys()
-                        items.sort()
-                        for item in items:
-                                fullpath = item
-                                while len(item) > 35:
-                                        item = item[:len(item)/2] + "" + item[len(item)/2+1:]
-                                if len(item) == 35:
-                                        item = item[:len(item)/2] + "..." + item[len(item)/2+3:]
-                                        self.tooltip_items[item] = fullpath
+                        for items in file_list.split(']'):
+                            if len(items) > 1:
+                                paths_temp = items.split(":")[0]
+                                paths_binb.append(paths_temp.strip(" ,'"))
+                                files_temp = items.split(":")[1]
+                                files_binb.append(files_temp.strip(" ['"))
 
-                                packagefiles_store.append([str(item)])
+                        unsorted_list = []
+                        
+                        for items in range(len(paths_binb)):
+                              if len(files_binb[items]) > 1:
+                                  for aduse in (files_binb[items].split(",")):
+                                        unsorted_list.append(paths_binb[items].split(name)[len(paths_binb[items].split(name))-1] + '/' + aduse.strip(" '"))
+                       
+                         
+                        unsorted_list.sort()
+                        for items in unsorted_list:
+                                temp = items
+                                while len(items) > 35:
+                                        items = items[:len(items)/2] + "" + items[len(items)/2+1:]
+                                if len(items) == 35:
+                                        items = items[:len(items)/2] + "..." + items[len(items)/2+3:]
+                                        self.tooltip_items[items] = temp
 
-                        self.packagefiles_tv.set_model(packagefiles_store)
+                                sstatemirrors_store.append([str(items)])
+                                
+                                
+                        self.sstatemirrors_tv.set_model(sstatemirrors_store)
 
                         tips = gtk.Tooltips()
-                        tips.set_tip(self.packagefiles_tv, "")
-                        self.packagefiles_tv.connect("motion-notify-event", self.treeViewTooltip, tips, 0)
-                        self.packagefiles_tv.set_events(gtk.gdk.POINTER_MOTION_MASK)
+                        tips.set_tip(self.sstatemirrors_tv, "")
+                        self.sstatemirrors_tv.connect("motion-notify-event", self.treeViewTooltip, tips, 0)
+                        self.sstatemirrors_tv.set_events(gtk.gdk.POINTER_MOTION_MASK)
                         
                         self.vbox.add(self.textWindow)                                      
 

bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py

@@ -146,11 +146,12 @@ class SaveImageDialog (CrumbsDialog):
             self.show_invalid_input_error_dialog()
 
     def show_invalid_input_error_dialog(self):
-        lbl = "<b>Invalid characters in image recipe name</b>"
+        lbl = "<b>Invalid characters in image recipe name</b>\n"
         msg = "Image recipe names should be all lowercase and\n"
         msg += "include only alphanumeric characters. The only\n"
         msg += "special character you can use is the ASCII hyphen (-)."
-        dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_ERROR, msg)
+        lbl = lbl + "\n%s\n" % glib.markup_escape_text(msg)
+        dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_ERROR)
         button = dialog.add_button("Close", gtk.RESPONSE_OK)
         HobButton.style_button(button)
 

bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py

@@ -211,19 +211,18 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
 
     def response_cb(self, dialog, response_id):
         if response_id == gtk.RESPONSE_YES:
-            if self.proxy_checkbox.get_active():
-                # Check that all proxy entries have a corresponding port
-                for proxy, port in zip(self.all_proxy_addresses, self.all_proxy_ports):
-                    if proxy.get_text() and not port.get_text():
-                        lbl = "<b>Enter all port numbers</b>"
-                        msg = "Proxy servers require a port number. Please make sure you have entered a port number for each proxy server."
-                        dialog = CrumbsMessageDialog(self, lbl, gtk.MESSAGE_WARNING, msg)
-                        button = dialog.add_button("Close", gtk.RESPONSE_OK)
-                        HobButton.style_button(button)
-                        response = dialog.run()
-                        dialog.destroy()
-                        self.emit_stop_by_name("response")
-                        return
+            # Check that all proxy entries have a corresponding port
+            for proxy, port in zip(self.all_proxy_addresses, self.all_proxy_ports):
+                if proxy.get_text() and not port.get_text():
+                    lbl = "<b>Enter all port numbers</b>\n\n"
+                    msg = "Proxy servers require a port number. Please make sure you have entered a port number for each proxy server."
+                    dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING, msg)
+                    button = dialog.add_button("Close", gtk.RESPONSE_OK)
+                    HobButton.style_button(button)
+                    response = dialog.run()
+                    dialog.destroy()
+                    self.emit_stop_by_name("response")
+                    return
 
         self.configuration.dldir = self.dldir_text.get_text()
         self.configuration.sstatedir = self.sstatedir_text.get_text()

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

@@ -98,7 +98,6 @@ class HobHandler(gobject.GObject):
 
         self.server = server
         self.error_msg = ""
-        self.lastCommand = ""
         self.initcmd = None
         self.parsing = False
 
@@ -113,7 +112,6 @@ class HobHandler(gobject.GObject):
             self.generating = False
 
     def runCommand(self, commandline):
-        self.lastCommand = commandline[0]
         try:
             result, error = self.server.runCommand(commandline)
             if error:
@@ -149,7 +147,9 @@ class HobHandler(gobject.GObject):
         elif next_command == self.SUB_MATCH_CLASS:
             self.runCommand(["findFilesMatchingInDir", "rootfs_", "classes"])
         elif next_command == self.SUB_PARSE_CONFIG:
-            self.runCommand(["resetCooker"])
+            self.runCommand(["enableDataTracking"])
+            self.runCommand(["parseConfigurationFiles", "conf/.hob.conf", ""])
+            self.runCommand(["disableDataTracking"])
         elif next_command == self.SUB_GNERATE_TGTS:
             self.runCommand(["generateTargetsTree", "classes/image.bbclass", []])
         elif next_command == self.SUB_GENERATE_PKGINFO:
@@ -204,8 +204,7 @@ class HobHandler(gobject.GObject):
             reparse = self.runCommand(["getVariable", "BB_INVALIDCONF"]) or None
             if reparse is True:
                 self.set_var_in_file("BB_INVALIDCONF", False, "local.conf")
-                self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""])
-                self.commands_async.prepend(self.SUB_PARSE_CONFIG)
+                self.runCommand(["parseConfigurationFiles", "conf/.hob.conf", ""])
             self.run_next_command()
 
         elif isinstance(event, bb.event.SanityCheckFailed):
@@ -252,10 +251,6 @@ class HobHandler(gobject.GObject):
             self.current_phase = None
             self.run_next_command()
         elif isinstance(event, bb.command.CommandFailed):
-            if self.error_msg == "":
-                self.error_msg = "The command \"" + self.lastCommand
-                self.error_msg += "\" was sent to bitbake server but it failed. Please"
-                self.error_msg += " check the code executed by this command in bitbake."
             self.commands_async = []
             self.display_error()
         elif isinstance(event, (bb.event.ParseStarted,
@@ -303,8 +298,14 @@ class HobHandler(gobject.GObject):
         return
 
     def init_cooker(self):
+        self.runCommand(["initCooker"])
         self.runCommand(["createConfigFile", ".hob.conf"])
 
+    def reset_cooker(self):
+        self.runCommand(["enableDataTracking"])
+        self.runCommand(["resetCooker"])
+        self.runCommand(["disableDataTracking"])
+
     def set_extra_inherit(self, bbclass):
         inherits = self.runCommand(["getVariable", "INHERIT"]) or ""
         inherits = inherits + " " + bbclass
@@ -404,17 +405,15 @@ class HobHandler(gobject.GObject):
         self.run_next_command(self.NETWORK_TEST)
 
     def generate_configuration(self):
-        self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""])
+        self.commands_async.append(self.SUB_PARSE_CONFIG)
         self.commands_async.append(self.SUB_PATH_LAYERS)
         self.commands_async.append(self.SUB_FILES_DISTRO)
         self.commands_async.append(self.SUB_FILES_MACH)
         self.commands_async.append(self.SUB_FILES_SDKMACH)
         self.commands_async.append(self.SUB_MATCH_CLASS)
-        self.commands_async.append(self.SUB_PARSE_CONFIG)
         self.run_next_command(self.GENERATE_CONFIGURATION)
 
     def generate_recipes(self):
-        self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""])
         self.commands_async.append(self.SUB_PARSE_CONFIG)
         self.commands_async.append(self.SUB_GNERATE_TGTS)
         self.run_next_command(self.GENERATE_RECIPES)
@@ -424,7 +423,6 @@ class HobHandler(gobject.GObject):
         targets.extend(tgts)
         self.recipe_queue = targets
         self.default_task = default_task
-        self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""])
         self.commands_async.append(self.SUB_PARSE_CONFIG)
         self.commands_async.append(self.SUB_BUILD_RECIPES)
         self.run_next_command(self.GENERATE_PACKAGES)
@@ -436,7 +434,6 @@ class HobHandler(gobject.GObject):
         self.package_queue = image_packages
         self.toolchain_packages = toolchain_packages
         self.default_task = default_task
-        self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""])
         self.commands_async.append(self.SUB_PARSE_CONFIG)
         self.commands_async.append(self.SUB_BUILD_IMAGE)
         self.run_next_command(self.GENERATE_IMAGE)

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

@@ -251,7 +251,7 @@ class PackageListModel(gtk.ListStore):
             pkgv = getpkgvalue(pkginfo, 'PKGV', pkg)
             pkgr = getpkgvalue(pkginfo, 'PKGR', pkg)
             # PKGSIZE is artificial, will always be overridden with the package name if present
-            pkgsize = int(pkginfo.get('PKGSIZE_%s' % pkg, "0"))
+            pkgsize = pkginfo.get('PKGSIZE_%s' % pkg, "0")
             # PKG_%s is the renamed version
             pkg_rename = pkginfo.get('PKG_%s' % pkg, "")
             # The rest may be overridden or not
@@ -268,10 +268,11 @@ class PackageListModel(gtk.ListStore):
 
             allow_empty = getpkgvalue(pkginfo, 'ALLOW_EMPTY', pkg, "")
 
-            if pkgsize == 0 and not allow_empty:
+            if pkgsize == "0" and not allow_empty:
                 continue
 
-            size = HobPage._size_to_string(pkgsize)
+            # pkgsize is in KB
+            size = HobPage._size_to_string(HobPage._string_to_size(pkgsize + ' KB'))
             self.set(self.append(), self.COL_NAME, pkg, self.COL_VER, pkgv,
                      self.COL_REV, pkgr, self.COL_RNM, pkg_rename,
                      self.COL_SEC, section, self.COL_SUM, summary,

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

@@ -734,7 +734,7 @@ class HobCellRendererController(gobject.GObject):
         self.current_angle_pos += self.step_angle
         if self.running_mode == self.MODE_CYCLE_RUNNING:
             if (self.current_angle_pos >= 1):
-                self.current_angle_pos = 0
+                self.current_angle_pos = self.step_angle
         else:
             if self.current_angle_pos > 1:
                 self.force_stop()

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

@@ -655,7 +655,7 @@ class ImageDetailsPage (HobPage):
         self.builder.show_configuration()
 
     def edit_packages_button_clicked_cb(self, button):
-        self.builder.show_packages()
+        self.builder.show_packages(ask=False)
 
     def my_images_button_clicked_cb(self, button):
         self.builder.show_load_my_images_dialog()

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

@@ -174,15 +174,6 @@ class RunningBuild (gobject.GObject):
                       color,
                       0))
 
-            # if there are warnings while processing a package
-            #  (parent), mark the task with warning color;
-            # in case there are errors, the updates will be
-            #  handled on TaskFailed.
-            if color == HobColors.WARNING and parent:
-                self.model.set(parent, self.model.COL_COLOR, color)
-                if task: #then we have a parent (package), and update it's color
-                    self.model.set(self.tasks_to_iter[(package, None)], self.model.COL_COLOR, color)
-
         elif isinstance(event, bb.build.TaskStarted):
             (package, task) = (event._package, event._task)
 
@@ -210,10 +201,9 @@ class RunningBuild (gobject.GObject):
 
             # Because this parent package now has an active child mark it as
             # such.
-            self.model.set(parent, self.model.COL_ICON, "gtk-execute")
-            parent_color = self.model.get(parent, self.model.COL_COLOR)[0]
-            if parent_color != HobColors.ERROR and parent_color != HobColors.WARNING:
-                self.model.set(parent, self.model.COL_COLOR, HobColors.RUNNING)
+            # @todo if parent is already in error, don't mark it green
+            self.model.set(parent, self.model.COL_ICON, "gtk-execute",
+                           self.model.COL_COLOR, HobColors.RUNNING)
 
             # Add an entry in the model for this task
             i = self.model.append (parent, (None,
@@ -256,28 +246,20 @@ class RunningBuild (gobject.GObject):
                     self.model.set(i, self.model.COL_ICON, icon,
                                    self.model.COL_COLOR, color)
             else:
-                # Mark the parent package and the task as inactive,
-                # but make sure to preserve error, warnings and active
-                # states
-                parent_color = self.model.get(parent, self.model.COL_COLOR)[0]
-                task_color = self.model.get(current, self.model.COL_COLOR)[0]
+                icon = None
+                color = HobColors.OK
 
                 # Mark the task as inactive
-                self.model.set(current, self.model.COL_ICON, None)
-                if task_color != HobColors.ERROR:
-                    if task_color == HobColors.WARNING:
-                        self.model.set(current, self.model.COL_ICON, 'dialog-warning')
-                    else:
-                        self.model.set(current, self.model.COL_COLOR, HobColors.OK)
+                self.model.set(current, self.model.COL_ICON, icon,
+                               self.model.COL_COLOR, color)
 
-                # Mark the parent as inactive
-                if parent_color != HobColors.ERROR:
-                    if parent_color == HobColors.WARNING:
-                        self.model.set(parent, self.model.COL_ICON, "dialog-warning")
-                    else:
-                        self.model.set(parent, self.model.COL_ICON, None)
-                        if num_active == 0:
-                            self.model.set(parent, self.model.COL_COLOR, HobColors.OK)
+                # Mark the parent package as inactive, but make sure to
+                # preserve error and active states
+                i = self.tasks_to_iter[(package, None)]
+                if self.model.get(parent, self.model.COL_ICON) != 'dialog-error':
+                    self.model.set(parent, self.model.COL_ICON, icon)
+                    if num_active == 0:
+                        self.model.set(parent, self.model.COL_COLOR, HobColors.OK)
 
             # Clear the iters and the pids since when the task goes away the
             # pid will no longer be used for messages

bitbake/lib/bb/ui/depexp.py

@@ -202,7 +202,7 @@ def main(server, eventHandler, params):
             return 1
         cmdline = cmdline['action']
         if not cmdline or cmdline[0] != "generateDotGraph":
-            print("This UI requires the -g option")
+            print("This UI is only compatible with the -g option")
             return 1
         ret, error = server.runCommand(["generateDepTreeEvent", cmdline[1], cmdline[2]])
         if error:

bitbake/lib/bb/ui/hob.py

@@ -46,7 +46,7 @@ from bb.ui.crumbs.hoblistmodel import RecipeListModel, PackageListModel
 from bb.ui.crumbs.hobeventhandler import HobHandler
 from bb.ui.crumbs.builder import Builder
 
-featureSet = [bb.cooker.CookerFeatures.HOB_EXTRA_CACHES, bb.cooker.CookerFeatures.BASEDATASTORE_TRACKING]
+featureSet = [bb.cooker.CookerFeatures.HOB_EXTRA_CACHES]
 
 def event_handle_idle_func(eventHandler, hobHandler):
     # Consume as many messages as we can in the time available to us

bitbake/lib/bb/ui/toasterui.py

@@ -1,279 +0,0 @@
-#
-# BitBake ToasterUI Implementation
-# based on (No)TTY UI Implementation by Richard Purdie
-#
-# Handling output to TTYs or files (no TTY)
-#
-# Copyright (C) 2006-2012 Richard Purdie
-# Copyright (C) 2013      Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from __future__ import division
-try:
-    import bb
-except RuntimeError as exc:
-    sys.exit(str(exc))
-
-from bb.ui import uihelper
-from bb.ui.buildinfohelper import BuildInfoHelper
-
-import bb.msg
-import copy
-import fcntl
-import logging
-import os
-import progressbar
-import signal
-import struct
-import sys
-import time
-import xmlrpclib
-
-featureSet = [bb.cooker.CookerFeatures.HOB_EXTRA_CACHES, bb.cooker.CookerFeatures.SEND_DEPENDS_TREE, bb.cooker.CookerFeatures.BASEDATASTORE_TRACKING]
-
-logger = logging.getLogger("BitBake")
-interactive = sys.stdout.isatty()
-
-
-
-def _log_settings_from_server(server):
-    # Get values of variables which control our output
-    includelogs, error = server.runCommand(["getVariable", "BBINCLUDELOGS"])
-    if error:
-        logger.error("Unable to get the value of BBINCLUDELOGS variable: %s" % error)
-        raise BaseException(error)
-    loglines, error = server.runCommand(["getVariable", "BBINCLUDELOGS_LINES"])
-    if error:
-        logger.error("Unable to get the value of BBINCLUDELOGS_LINES variable: %s" % error)
-        raise BaseException(error)
-    return includelogs, loglines
-
-def main(server, eventHandler, params ):
-
-    includelogs, loglines = _log_settings_from_server(server)
-
-    # verify and warn
-    build_history_enabled = True
-    inheritlist, error = server.runCommand(["getVariable", "INHERIT"])
-    if not "buildhistory" in inheritlist.split(" "):
-        logger.warn("buildhistory is not enabled. Please enable INHERIT += \"buildhistory\" to see image details.")
-        build_history_enabled = False
-
-    helper = uihelper.BBUIHelper()
-
-    console = logging.StreamHandler(sys.stdout)
-    format_str = "%(levelname)s: %(message)s"
-    format = bb.msg.BBLogFormatter(format_str)
-    bb.msg.addDefaultlogFilter(console)
-    console.setFormatter(format)
-    logger.addHandler(console)
-
-    if not params.observe_only:
-        logger.error("ToasterUI can only work in observer mode")
-        return
-
-
-    main.shutdown = 0
-    interrupted = False
-    return_value = 0
-    errors = 0
-    warnings = 0
-    taskfailures = []
-
-    buildinfohelper = BuildInfoHelper(server, build_history_enabled)
-    buildinfohelper.store_layer_info()
-
-
-    while True:
-        try:
-            event = eventHandler.waitEvent(0.25)
-
-            if event is None:
-                if main.shutdown > 0:
-                    break
-                continue
-
-            helper.eventHandler(event)
-
-            if isinstance(event, bb.event.BuildStarted):
-                buildinfohelper.store_started_build(event)
-
-            if isinstance(event, (bb.build.TaskStarted, bb.build.TaskSucceeded, bb.build.TaskFailedSilent)):
-                buildinfohelper.update_and_store_task(event)
-                continue
-
-            if isinstance(event, bb.event.LogExecTTY):
-                logger.warn(event.msg)
-                continue
-
-            if isinstance(event, logging.LogRecord):
-                buildinfohelper.store_log_event(event)
-                if event.levelno >= format.ERROR:
-                    errors = errors + 1
-                    return_value = 1
-                elif event.levelno == format.WARNING:
-                    warnings = warnings + 1
-                # For "normal" logging conditions, don't show note logs from tasks
-                # but do show them if the user has changed the default log level to
-                # include verbose/debug messages
-                if event.taskpid != 0 and event.levelno <= format.NOTE:
-                    continue
-
-                logger.handle(event)
-                continue
-
-            if isinstance(event, bb.build.TaskFailed):
-                buildinfohelper.update_and_store_task(event)
-                return_value = 1
-                logfile = event.logfile
-                if logfile and os.path.exists(logfile):
-                    bb.error("Logfile of failure stored in: %s" % logfile)
-                continue
-
-            # these events are unprocessed now, but may be used in the future to log
-            # timing and error informations from the parsing phase in Toaster
-            if isinstance(event, bb.event.ParseStarted):
-                continue
-            if isinstance(event, bb.event.ParseProgress):
-                continue
-            if isinstance(event, bb.event.ParseCompleted):
-                continue
-            if isinstance(event, bb.event.CacheLoadStarted):
-                continue
-            if isinstance(event, bb.event.CacheLoadProgress):
-                continue
-            if isinstance(event, bb.event.CacheLoadCompleted):
-                continue
-            if isinstance(event, bb.event.MultipleProviders):
-                continue
-            if isinstance(event, bb.event.NoProvider):
-                return_value = 1
-                errors = errors + 1
-                if event._runtime:
-                    r = "R"
-                else:
-                    r = ""
-
-                if event._dependees:
-                    text = "Nothing %sPROVIDES '%s' (but %s %sDEPENDS on or otherwise requires it)" % (r, event._item, ", ".join(event._dependees), r)
-                else:
-                    text = "Nothing %sPROVIDES '%s'" % (r, event._item)
-
-                logger.error(text)
-                if event._reasons:
-                    for reason in event._reasons:
-                        logger.error("%s", reason)
-                        text += reason
-                buildinfohelper.store_log_error(text)
-                continue
-
-            if isinstance(event, bb.event.ConfigParsed):
-                continue
-            if isinstance(event, bb.event.RecipeParsed):
-                continue
-
-            # end of saved events
-
-            if isinstance(event, (bb.runqueue.sceneQueueTaskStarted, bb.runqueue.runQueueTaskStarted, bb.runqueue.runQueueTaskSkipped)):
-                buildinfohelper.store_started_task(event)
-                continue
-
-            if isinstance(event, bb.runqueue.runQueueTaskCompleted):
-                buildinfohelper.update_and_store_task(event)
-                continue
-
-            if isinstance(event, bb.runqueue.runQueueTaskFailed):
-                buildinfohelper.update_and_store_task(event)
-                taskfailures.append(event.taskstring)
-                logger.error("Task %s (%s) failed with exit code '%s'",
-                             event.taskid, event.taskstring, event.exitcode)
-                continue
-
-            if isinstance(event, (bb.runqueue.sceneQueueTaskCompleted, bb.runqueue.sceneQueueTaskFailed)):
-                buildinfohelper.update_and_store_task(event)
-                continue
-
-
-            if isinstance(event, (bb.event.TreeDataPreparationStarted, bb.event.TreeDataPreparationCompleted)):
-                continue
-
-            if isinstance(event, (bb.event.BuildCompleted)):
-                buildinfohelper.read_target_package_dep_data(event)
-                buildinfohelper.update_build_information(event, errors, warnings, taskfailures)
-                continue
-
-            if isinstance(event, (bb.command.CommandCompleted,
-                                  bb.command.CommandFailed,
-                                  bb.command.CommandExit)):
-                if (isinstance(event, bb.command.CommandFailed)):
-                    event.levelno = format.ERROR
-                    event.msg = event.error
-                    event.pathname = ""
-                    event.lineno = 0
-                    buildinfohelper.store_log_event(event)
-                    errors += 1
-
-                buildinfohelper.update_build_information(event, errors, warnings, taskfailures)
-
-                # we start a new build info
-                errors = 0
-                warnings = 0
-                taskfailures = []
-                buildinfohelper = BuildInfoHelper(server, build_history_enabled)
-                buildinfohelper.store_layer_info()
-                continue
-
-            if isinstance(event, bb.event.MetadataEvent):
-                if event.type == "SinglePackageInfo":
-                    buildinfohelper.store_build_package_information(event)
-                continue
-
-            # ignore
-            if isinstance(event, (bb.event.BuildBase,
-                                  bb.event.StampUpdate,
-                                  bb.event.RecipePreFinalise,
-                                  bb.runqueue.runQueueEvent,
-                                  bb.runqueue.runQueueExitWait,
-                                  bb.event.OperationProgress,
-                                  bb.command.CommandFailed,
-                                  bb.command.CommandExit,
-                                  bb.command.CommandCompleted,
-                                  bb.cooker.CookerExit)):
-                continue
-
-            if isinstance(event, bb.event.DepTreeGenerated):
-                buildinfohelper.store_dependency_information(event)
-                continue
-
-            logger.error("Unknown event: %s", event)
-
-        except EnvironmentError as ioerror:
-            # ignore interrupted io
-            if ioerror.args[0] == 4:
-                pass
-        except KeyboardInterrupt:
-            main.shutdown = 1
-            pass
-        except Exception as e:
-            logger.error(e)
-            import traceback
-            traceback.print_exc()
-            pass
-
-    if interrupted:
-        if return_value == 0:
-            return_value = 1
-
-    return return_value

bitbake/lib/bb/utils.py

@@ -354,9 +354,6 @@ def better_exec(code, context, text = None, realfile = "<code>"):
         code = better_compile(code, realfile, realfile)
     try:
         exec(code, get_context(), context)
-    except bb.BBHandledException:
-        # Error already shown so passthrough
-        raise
     except Exception as e:
         (t, value, tb) = sys.exc_info()
 

bitbake/lib/prserv/serv.py

@@ -13,7 +13,6 @@ except ImportError:
 import bb.server.xmlrpc
 import prserv
 import prserv.db
-import errno
 
 logger = logging.getLogger("BitBake.PRserv")
 
@@ -281,18 +280,8 @@ def stop_daemon(host, port):
         if pid:
             if os.path.exists(pidfile):
                 os.remove(pidfile)
-
-            wait_timeout = 0
-            while is_running(pid) and wait_timeout < 10:
-                print("Waiting for pr-server to exit.")
-                time.sleep(0.5)
-                wait_timeout += 1
-
-            if is_running(pid):
-                print("Sending SIGTERM to pr-server.")
-                os.kill(pid,signal.SIGTERM)
-                time.sleep(0.1)
-
+            os.kill(pid,signal.SIGTERM)
+            time.sleep(0.1)
     except OSError as e:
         err = str(e)
         if err.find("No such process") <= 0:
@@ -300,14 +289,6 @@ def stop_daemon(host, port):
 
     return 0
 
-def is_running(pid):
-    try:
-        os.kill(pid, 0)
-    except OSError as err:
-        if err.errno == errno.ESRCH:
-            return False
-    return True
-
 def is_local_special(host, port):
     if host.strip().upper() == 'localhost'.upper() and (not port):
         return True

bitbake/lib/toaster/bldviewer/api.py

@@ -1,37 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from django.conf.urls import patterns, include, url
-
-
-urlpatterns = patterns('bldviewer.views',
-        url(r'^builds$', 'model_explorer',  {'model_name':'build'}, name='builds'),
-        url(r'^targets$', 'model_explorer',  {'model_name':'target'}, name='targets'),
-        url(r'^tasks$', 'model_explorer', {'model_name':'task'}, name='task'),
-        url(r'^task_dependencies$', 'model_explorer',  {'model_name':'task_dependency'}, name='task_dependencies'),
-        url(r'^packages$', 'model_explorer',  {'model_name':'build_package'}, name='build_packages'),
-        url(r'^package_dependencies$', 'model_explorer',  {'model_name':'build_package_dependency'}, name='build_package_dependencies'),
-        url(r'^target_packages$', 'model_explorer',  {'model_name':'target_package'}, name='target_packages'),
-        url(r'^package_files$', 'model_explorer',  {'model_name':'build_file'}, name='build_files'),
-        url(r'^layers$', 'model_explorer', {'model_name':'layer'}, name='layer'),
-        url(r'^layerversions$', 'model_explorer', {'model_name':'layerversion'}, name='layerversion'),
-        url(r'^recipes$', 'model_explorer', {'model_name':'recipe'}, name='recipe'),
-        url(r'^recipe_dependencies$', 'model_explorer',  {'model_name':'recipe_dependency'}, name='recipe_dependencies'),
-        url(r'^variables$', 'model_explorer',  {'model_name':'variable'}, name='variables'),
-        url(r'^logmessages$', 'model_explorer',  {'model_name':'logmessage'}, name='logmessages'),
-)

bitbake/lib/toaster/bldviewer/templates/base.html

@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-{% load static %}
-<html>
-	<head>
-		<title>Toaster Simple Explorer</title>
-<script src="{% static 'js/jquery-2.0.3.js' %}">
-</script>
-<script src="{% static 'js/bootstrap.js' %}">
-</script>
-<link href="{% static 'css/bootstrap.css' %}" rel="stylesheet" type="text/css">
-	</head>
-
-<body style="height: 100%">
-<div style="width:100%; height: 100%; position:absolute">
-<div style="width: 100%; height: 3em" class="nav">
-    <ul class="nav nav-tabs">
-        <li><a href="{% url all-builds %}">All Builds</a></li>
-        <li><a href="{% url all-layers %}">All Layers</a></li>
-    </ul>
-</div>
-
-<div style="overflow-y:scroll; width: 100%; position: absolute; top: 3em; bottom:70px ">
-{% block pagecontent %}
-{% endblock %}
-</div>
-<div class="navbar" style="position: absolute; bottom: 0; width:100%"><br/>About Toaster | Yocto Project </div>
-</div>
-</body>
-</html>
-

bitbake/lib/toaster/bldviewer/templates/basebuildpage.html

@@ -1,17 +0,0 @@
-{% extends "basetable.html" %}
-
-{% block pagename %}
-<ul class="nav nav-tabs" style="display: inline-block">
-  <li><a>Build {{build.target_set.all|join:"&nbsp;"}} at {{build.started_on}} : </a></li>
-  <li><a href="{% url task build.id %}"> Tasks </a></li>
-  <li><a href="{% url bpackage build.id %}"> Build Packages </a></li>
-    {% for t in build.target_set.all %}
-        {% if t.is_image %}
-  <li><a href="{% url tpackage build.id t.pk %}"> Packages for {{t.target}} </a> </li>
-        {% endif %}
-    {% endfor %}
-  <li><a href="{% url configuration build.id %}"> Configuration </a> </li>
-</ul>
-     <h1>Toaster - Build {% block pagetitle %} {% endblock %}</h1>
-{% endblock %}
-

bitbake/lib/toaster/bldviewer/templates/basetable.html

@@ -1,46 +0,0 @@
-{% extends "base.html" %}
-
-{% block pagecontent %}
-<script>
-function showhideTableColumn(i, sh) {
-    if (sh)
-        $('td:nth-child('+i+'),th:nth-child('+i+')').show();
-    else
-        $('td:nth-child('+i+'),th:nth-child('+i+')').hide();
-}
-
-
-function filterTableRows(test) {
-    if (test.length > 0) {
-        var r = test.split(/[ ,]+/).map(function (e) { return new RegExp(e, 'i') });
-        $('tr.data').map( function (i, el) {
-            (! r.map(function (j) { return j.test($(el).html())}).reduce(function (c, p) { return c && p;} )) ? $(el).hide() : $(el).show();
-        });
-    } else
-    {
-        $('tr.data').show();
-    }
-}
-</script>
-<div style="margin-bottom: 0.5em">
-
-    {% block pagename %}
-    {% endblock %}
-    <div align="left" style="display:inline-block; width: 40%; margin-left: 2em"> Search: <input type="search" id="filterstring" style="width: 80%" onkeyup="filterTableRows($('#filterstring').val())" autocomplete="off">
-    </div>
-    {% if hideshowcols %}
-    <div align="right" style="display: inline-block; width: 40%">Show/Hide columns:
-    {% for i in hideshowcols %}
-        <span>{{i.name}} <input type="checkbox" id="ct{{i.name}}" onchange="showhideTableColumn({{i.order}}, $('#ct{{i.name}}').is(':checked'))" checked autocomplete="off"></span> |
-    {% endfor %}
-    </div>
-    {% endif %}
-</div>
-<div>
-    <table class="table table-striped table-condensed" style="width:95%">
-{% block pagetable %}
-{% endblock %}
-    </table>
-</div>
-
-{% endblock %}

bitbake/lib/toaster/bldviewer/templates/bfile.html

@@ -1,24 +0,0 @@
-{% extends "basebuildpage.html" %}
-
-{% block pagetitle %}Files for package {{files.0.bpackage.name}} {% endblock %}
-{% block pagetable %}
-    {% if not files %}
-        <p>No files were recorded for this package!</p>
-    {% else %}
-
-            <tr>
-            <th>Name</th>
-            <th>Size (Bytes)</th>
-            </tr>
-
-            {% for file in files %}
-
-            <tr class="data">
-            <td>{{file.path}}</td>
-            <td>{{file.size}}</td>
-
-            {% endfor %}
-
-    {% endif %}
-
-{% endblock %}

bitbake/lib/toaster/bldviewer/templates/bpackage.html

@@ -1,44 +0,0 @@
-{% extends "basebuildpage.html" %}
-
-{% block pagetitle %}Packages{% endblock %}
-{% block pagetable %}
-    {% if not packages %}
-        <p>No packages were recorded for this target!</p>
-    {% else %}
-
-            <tr>
-            <th>Name</th>
-            <th>Version</th>
-            <th>Recipe</th>
-            <th>Summary</th>
-            <th>Section</th>
-            <th>Description</th>
-            <th>Size on host disk (Bytes)</th>
-            <th>License</th>
-            <th>Dependencies List (all)</th>
-            </tr>
-
-            {% for package in packages %}
-
-            <tr class="data">
-                <td><a name="#{{package.name}}" href="{% url bfile build.pk package.pk %}">{{package.name}} ({{package.filelist_bpackage.count}} files)</a></td>
-                <td>{{package.version}}-{{package.revision}}</td>
-                <td><a href="{% url layer_versions_recipes package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a></td>
-
-            <td>{{package.summary}}</td>
-            <td>{{package.section}}</td>
-            <td>{{package.description}}</td>
-            <td>{{package.size}}</td>
-            <td>{{package.license}}</td>
-            <td>
-        <div style="height: 3em; overflow:auto">
-            {% for bpd in package.bpackage_dependencies_package.all %}
-                {{bpd.dep_type}}: {{bpd.depends_on}} <br/>
-            {% endfor %}
-        </div>
-            </td>
-            {% endfor %}
-
-    {% endif %}
-
-{% endblock %}

bitbake/lib/toaster/bldviewer/templates/build.html

@@ -1,43 +0,0 @@
-{% extends "basetable.html" %}
-
-{% block pagename %}
-    <h1>Toaster - Builds</h1>
-{% endblock %}
-
-{% block pagetable %}
-
-    {% load projecttags %}
-        <tr>
-            <th>Outcome</th>
-            <th>Started On</th>
-            <th>Completed On</th>
-            <th>Target</th>
-            <th>Machine</th>
-            <th>Time</th>
-            <th>Errors</th>
-            <th>Warnings</th>
-            <th>Output</th>
-            <th>Log</th>
-            <th>Bitbake Version</th>
-            <th>Build Name</th>
-        </tr>
-        {% for build in builds %}
-        <tr class="data">
-            <td><a href="{% url configuration build.id %}">{{build.get_outcome_display}}</a></td>
-            <td>{{build.started_on}}</td>
-            <td>{{build.completed_on}}</td>
-            <td>{% for t in build.target_set.all %}<a href="{% url tpackage build.id t.id %}">{{t.target}}</a>{% if t.is_image %} (Img){% endif %}<br/>{% endfor %}</td>
-            <td>{{build.machine}}</td>
-            <td>{% time_difference build.started_on build.completed_on %}</td>
-            <td>{{build.errors_no}}:{% if  build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}<p>{{error.message}}</p>{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %}</td>
-            <td>{{build.warnings_no}}:{% if  build.warnings_no %}{% for warning in logs %}{% if warning.build == build %}{% if warning.level == 1 %}<p>{{warning.message}}</p>{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %}</td>
-            <td>{% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}{{build.image_fstypes}}{% endif %}{% endfor %}{% endif %}</td>
-            <td>{{build.cooker_log_path}}</td>
-            <td>{{build.bitbake_version}}</td>
-            <td>{{build.build_name}}</td>
-        </tr>
-
-        {% endfor %}
-{% endblock %}
-
-

bitbake/lib/toaster/bldviewer/templates/configuration.html

@@ -1,22 +0,0 @@
-{% extends "basebuildpage.html" %}
-
-{% block pagetitle %}Configuration{% endblock %}
-{% block pagetable %}
-
-            <tr>
-            <th>Name</th>
-            <th>Description</th>
-            <th>Definition history</th>
-            <th>Value</th>
-            </tr>
-
-            {% for variable in configuration %}
-
-            <tr class="data">
-                <td>{{variable.variable_name}}</td>
-                <td>{% if variable.description %}{{variable.description}}{% endif %}</td>
-                <td>{% for vh in variable.variablehistory_set.all %}{{vh.operation}} in {{vh.file_name}}:{{vh.line_number}}<br/>{%endfor%}</td>
-                <td>{{variable.variable_value}}</td>
-            {% endfor %}
-
-{% endblock %}

bitbake/lib/toaster/bldviewer/templates/layer.html

@@ -1,34 +0,0 @@
-{% extends "basetable.html" %}
-
-{% block pagename %}
-    <h1>Toaster - Layers</h1>
-{% endblock %}
-
-{% block pagetable %}
-    {% load projecttags %}
-
-        <tr>
-            <th>Name</th>
-            <th>Local Path</th>
-            <th>Layer Index URL</th>
-            <th>Known Versions</th>
-        </tr>
-
-        {% for layer in layers %}
-
-        <tr class="data">
-            <td>{{layer.name}}</td>
-            <td>{{layer.local_path}}</td>
-            <td><a href='{{layer.layer_index_url}}'>{{layer.layer_index_url}}</a></td>
-            <td><table>
-            {% for lv in layer.versions %}
-                <tr><td>
-        <a href="{% url layer_versions_recipes lv.id %}">({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)</a>
-                </td></tr>
-            {% endfor %}
-            </table></td>
-        </tr>
-
-        {% endfor %}
-
-{% endblock %}

bitbake/lib/toaster/bldviewer/templates/package.html

@@ -1,36 +0,0 @@
-{% extends "basebuildpage.html" %}
-
-{% block pagetable %}
-    {% if not packages %}
-        <p>No packages were recorded for this target!</p>
-    {% else %}
-
-            <tr>
-            <th>Name</th>
-            <th>Version</th>
-            <th>Size (Bytes)</th>
-            <th>Recipe</th>
-            <th>Depends on</th>
-            </tr>
-
-            {% for package in packages %}
-
-            <tr class="data">
-                <td><a name="#{{package.name}}">{{package.name}}</a></td>
-                <td>{{package.version}}</td>
-                <td>{{package.size}}</td>
-                <td>{%if package.recipe %}<a name="{{package.recipe.name}}.{{package.package_name}}">
-                <a href="{% url layer_versions_recipes package.recipe.layer_version_id %}#{{package.recipe.name}}">{{package.recipe.name}}</a>{{package.package_name}}</a>{%endif%}</td>
-                <td>
-            <div style="height: 4em; overflow:auto">
-                    {% for d in package.tpackage_dependencies_package.all %}
-                    <a href="#{{d.name}}">{{d.depends_on.name}}</a><br/>
-                    {% endfor %}
-            </div>
-                </td>
-
-            {% endfor %}
-
-    {% endif %}
-
-{% endblock %}

bitbake/lib/toaster/bldviewer/templates/recipe.html

@@ -1,53 +0,0 @@
-{% extends "basetable.html" %}
-
-{% block pagename %}
-<ul class="nav nav-tabs" style="display: inline-block">
-  <li><a>Layer  {{layer_version.layer.name}}&nbsp;:&nbsp;{{layer_version.branch}}&nbsp;:&nbsp;{{layer_version.commit}}&nbsp;:&nbsp;{{layer_version.priority}}</a></li>
-</ul>
-    <h1>Toaster - Recipes for a Layer</h1>
-{% endblock %}
-
-{% block pagetable %}
-    {% load projecttags %}
-
-        <tr>
-        </tr>
-            <th>Name</th>
-            <th>Version</th>
-            <th>Summary</th>
-            <th>Description</th>
-            <th>Section</th>
-            <th>License</th>
-            <th>License file</th>
-            <th>Homepage</th>
-            <th>Bugtracker</th>
-            <th>Author</th>
-            <th>File_path</th>
-            <th style="width: 30em">Recipe Dependency</th>
-
-
-        {% for recipe in recipes %}
-
-        <tr class="data">
-            <td><a name="{{recipe.name}}">{{recipe.name}}</a></td>
-            <td>{{recipe.version}}</td>
-            <td>{{recipe.summary}}</td>
-            <td>{{recipe.description}}</td>
-            <td>{{recipe.section}}</td>
-            <td>{{recipe.license}}</td>
-            <td>{{recipe.licensing_info}}</td>
-            <td>{{recipe.homepage}}</td>
-            <td>{{recipe.bugtracker}}</td>
-            <td>{{recipe.file_path}}</td>
-            <td>
-        <div style="height: 5em; overflow:auto">
-            {% for rr in recipe.r_dependencies_recipe.all %}
-                <a href="#{{rr.depends_on.name}}">{{rr.depends_on.name}}</a><br/>
-            {% endfor %}
-        </div>
-            </td>
-        </tr>
-
-        {% endfor %}
-
-{% endblock %}

bitbake/lib/toaster/bldviewer/templates/task.html

@@ -1,63 +0,0 @@
-{% extends "basebuildpage.html" %}
-
-{% block pagetitle %}Tasks{% endblock %}
-{% block pagetable %}
-    {% if not tasks %}
-        <p>No tasks were executed in this build!</p>
-    {% else %}
-
-            <tr>
-            <th>Order</th>
-            <th>Task</th>
-            <th>Recipe Version</th>
-            <th>Task Type</th>
-            <th>Checksum</th>
-            <th>Outcome</th>
-            <th>Message</th>
-            <th>Logfile</th>
-            <th>Time</th>
-            <th>CPU usage</th>
-            <th>Disk I/O</th>
-            <th>Script type</th>
-            <th>File path</th>
-            <th>Depends</th>
-            </tr>
-
-            {% for task in tasks %}
-
-            <tr class="data">
-                <td>{{task.order}}</td>
-                <td><a name="{{task.recipe.name}}.{{task.task_name}}">
-                <a href="{% url layer_versions_recipes task.recipe.layer_version_id %}#{{task.recipe.name}}">{{task.recipe.name}}</a>.{{task.task_name}}</a></td>
-                <td>{{task.recipe.version}}</td>
-
-                {% if task.task_executed %}
-                <td>Executed</td>
-                {% else %}
-                <td>Prebuilt</td>
-                {% endif %}
-
-                <td>{{task.sstate_checksum}}</td>
-                <td>{{task.get_outcome_display}}{% if task.provider %}</br>(by <a href="#{{task.provider.recipe.name}}.{{task.provider.task_name}}">{{task.provider.recipe.name}}.{{task.provider.task_name}}</a>){% endif %}</td>
-                <td><p>{{task.message}}</td>
-                <td><a target="_fileview" href="file:///{{task.logfile}}">{{task.logfile}}</a></td>
-                <td>{{task.elapsed_time}}</td>
-                <td>{{task.cpu_usage}}</td>
-                <td>{{task.disk_io}}</td>
-                <td>{{task.get_script_type_display}}</td>
-                <td><a target="_fileview" href="file:///{{task.recipe.file_path}}">{{task.recipe.file_path}}</a></td>
-                <td>
-            <div style="height: 3em; overflow:auto">
-                {% for tt in task.task_dependencies_task.all %}
-                    <a href="#{{tt.depends_on.recipe.name}}.{{tt.depends_on.task_name}}">
-                    {{tt.depends_on.recipe.name}}.{{tt.depends_on.task_name}}</a><br/>
-                {% endfor %}
-            </div>
-                </td>
-                </tr>
-
-            {% endfor %}
-
-    {% endif %}
-
-{% endblock %}

bitbake/lib/toaster/bldviewer/templatetags/projecttags.py

@@ -1,26 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from datetime import datetime
-from django import template
-
-register = template.Library()
-
-@register.simple_tag
-def time_difference(start_time, end_time):
-    return end_time - start_time

bitbake/lib/toaster/bldviewer/urls.py

@@ -1,32 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from django.conf.urls import patterns, include, url
-from django.views.generic.simple import redirect_to
-
-urlpatterns = patterns('bldviewer.views',
-        url(r'^builds/$', 'build', name='all-builds'),
-        url(r'^build/(?P<build_id>\d+)/task/$', 'task', name='task'),
-        url(r'^build/(?P<build_id>\d+)/packages/$', 'bpackage', name='bpackage'),
-        url(r'^build/(?P<build_id>\d+)/package/(?P<package_id>\d+)/files/$', 'bfile', name='bfile'),
-        url(r'^build/(?P<build_id>\d+)/target/(?P<target_id>\d+)/packages/$', 'tpackage', name='tpackage'),
-        url(r'^build/(?P<build_id>\d+)/configuration/$', 'configuration', name='configuration'),
-        url(r'^layers/$', 'layer', name='all-layers'),
-        url(r'^layerversions/(?P<layerversion_id>\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'),
-        url(r'^$', redirect_to, {'url': 'builds/'}),
-)

bitbake/lib/toaster/bldviewer/views.py

@@ -1,260 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import operator
-
-from django.db.models import Q
-from django.shortcuts import render
-from orm.models import Build, Target, Task, Layer, Layer_Version, Recipe, Target_Package, LogMessage, Variable
-from orm.models import Task_Dependency, Recipe_Dependency, Build_Package, Build_File, Build_Package_Dependency
-from django.views.decorators.cache import cache_control
-
-@cache_control(no_store=True)
-def build(request):
-    template = 'build.html'
-    build_info = Build.objects.all()
-
-    logs = LogMessage.objects.all()
-
-    context = {'builds': build_info, 'logs': logs ,
-        'hideshowcols' : [
-                {'name': 'Output', 'order':10},
-                {'name': 'Log', 'order':11},
-            ]}
-
-    return render(request, template, context)
-
-
-def _find_task_revdep(task):
-    tp = []
-    for p in Task_Dependency.objects.filter(depends_on=task):
-        tp.append(p.task);
-    return tp
-
-def _find_task_provider(task):
-    task_revdeps = _find_task_revdep(task)
-    for tr in task_revdeps:
-        if tr.outcome != Task.OUTCOME_COVERED:
-            return tr
-    for tr in task_revdeps:
-        trc = _find_task_provider(tr)
-        if trc is not None:
-            return trc
-    return None
-
-def task(request, build_id):
-    template = 'task.html'
-
-    tasks = Task.objects.filter(build=build_id)
-
-    for t in tasks:
-        if t.outcome == Task.OUTCOME_COVERED:
-            t.provider = _find_task_provider(t)
-
-    context = {'build': Build.objects.filter(pk=build_id)[0], 'tasks': tasks}
-
-    return render(request, template, context)
-
-def configuration(request, build_id):
-    template = 'configuration.html'
-    variables = Variable.objects.filter(build=build_id)
-    context = {'build': Build.objects.filter(pk=build_id)[0], 'configuration' : variables}
-    return render(request, template, context)
-
-def bpackage(request, build_id):
-    template = 'bpackage.html'
-    packages = Build_Package.objects.filter(build = build_id)
-    context = {'build': Build.objects.filter(pk=build_id)[0], 'packages' : packages}
-    return render(request, template, context)
-
-def bfile(request, build_id, package_id):
-    template = 'bfile.html'
-    files = Build_File.objects.filter(bpackage = package_id)
-    context = {'build': Build.objects.filter(pk=build_id)[0], 'files' : files}
-    return render(request, template, context)
-
-def tpackage(request, build_id, target_id):
-    template = 'package.html'
-
-    packages = Target_Package.objects.filter(target=target_id)
-
-    context = {'build' : Build.objects.filter(pk=build_id)[0],'packages': packages}
-
-    return render(request, template, context)
-
-def layer(request):
-    template = 'layer.html'
-    layer_info = Layer.objects.all()
-
-    for li in layer_info:
-        li.versions = Layer_Version.objects.filter(layer = li)
-        for liv in li.versions:
-            liv.count = Recipe.objects.filter(layer_version__id = liv.id).count()
-
-    context = {'layers': layer_info}
-
-    return render(request, template, context)
-
-
-def layer_versions_recipes(request, layerversion_id):
-    template = 'recipe.html'
-    recipes = Recipe.objects.filter(layer_version__id = layerversion_id)
-
-    context = {'recipes': recipes,
-            'layer_version' : Layer_Version.objects.filter( id = layerversion_id )[0]
-    }
-
-    return render(request, template, context)
-
-#### API
-
-import json
-from django.core import serializers
-from django.http import HttpResponse, HttpResponseBadRequest
-
-
-def model_explorer(request, model_name):
-
-    DESCENDING = 'desc'
-    response_data = {}
-    model_mapping = {
-        'build': Build,
-        'target': Target,
-        'target_package': Target_Package,
-        'task': Task,
-        'task_dependency': Task_Dependency,
-        'package': Build_Package,
-        'layer': Layer,
-        'layerversion': Layer_Version,
-        'recipe': Recipe,
-        'recipe_dependency': Recipe_Dependency,
-        'build_package': Build_Package,
-        'build_package_dependency': Build_Package_Dependency,
-        'build_file': Build_File,
-        'variable': Variable,
-        'logmessage': LogMessage,
-        }
-
-    if model_name not in model_mapping.keys():
-        return HttpResponseBadRequest()
-
-    model = model_mapping[model_name]
-
-    try:
-        limit = int(request.GET.get('limit', 0))
-    except ValueError:
-        limit = 0
-
-    try:
-        offset = int(request.GET.get('offset', 0))
-    except ValueError:
-        offset = 0
-
-    ordering_string, invalid = _validate_input(request.GET.get('orderby', ''),
-                                               model)
-    if invalid:
-        return HttpResponseBadRequest()
-
-    filter_string, invalid = _validate_input(request.GET.get('filter', ''),
-                                             model)
-    if invalid:
-        return HttpResponseBadRequest()
-
-    search_term = request.GET.get('search', '')
-
-    if filter_string:
-        filter_terms = _get_filtering_terms(filter_string)
-        try:
-            queryset = model.objects.filter(**filter_terms)
-        except ValueError:
-            queryset = []
-    else:
-        queryset = model.objects.all()
-
-    if search_term:
-        queryset = _get_search_results(search_term, queryset, model)
-
-    if ordering_string and queryset:
-        column, order = ordering_string.split(':')
-        if order.lower() == DESCENDING:
-            queryset = queryset.order_by('-' + column)
-        else:
-            queryset = queryset.order_by(column)
-
-    if offset and limit:
-        queryset = queryset[offset:(offset+limit)]
-    elif offset:
-        queryset = queryset[offset:]
-    elif limit:
-        queryset = queryset[:limit]
-
-    if queryset:
-        response_data['count'] = queryset.count()
-    else:
-        response_data['count'] = 0
-
-    response_data['list'] = serializers.serialize('json', queryset)
-
-    return HttpResponse(json.dumps(response_data),
-                        content_type='application/json')
-
-def _get_filtering_terms(filter_string):
-
-    search_terms = filter_string.split(":")
-    keys = search_terms[0].split(',')
-    values = search_terms[1].split(',')
-
-    return dict(zip(keys, values))
-
-def _validate_input(input, model):
-
-    invalid = 0
-
-    if input:
-        input_list = input.split(":")
-
-        # Check we have only one colon
-        if len(input_list) != 2:
-            invalid = 1
-            return None, invalid
-
-        # Check we have an equal number of terms both sides of the colon
-        if len(input_list[0].split(',')) != len(input_list[1].split(',')):
-            invalid = 1
-            return None, invalid
-
-        # Check we are looking for a valid field
-        valid_fields = model._meta.get_all_field_names()
-        for field in input_list[0].split(','):
-            if field not in valid_fields:
-                invalid = 1
-                return None, invalid
-
-    return input, invalid
-
-def _get_search_results(search_term, queryset, model):
-    search_objects = []
-    for st in search_term.split(" "):
-        q_map = map(lambda x: Q(**{x+'__icontains': st}),
-                model.search_allowed_fields)
-
-        search_objects.append(reduce(operator.or_, q_map))
-    search_object = reduce(operator.and_, search_objects)
-    queryset = queryset.filter(search_object)
-
-    return queryset

bitbake/lib/toaster/manage.py

@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "toastermain.settings")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)

bitbake/lib/toaster/orm/models.py

@@ -1,265 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
-
-
-class Build(models.Model):
-    SUCCEEDED = 0
-    FAILED = 1
-    IN_PROGRESS = 2
-
-    BUILD_OUTCOME = (
-        (SUCCEEDED, 'Succeeded'),
-        (FAILED, 'Failed'),
-        (IN_PROGRESS, 'In Progress'),
-    )
-
-    search_allowed_fields = ['machine',
-                             'cooker_log_path']
-
-    machine = models.CharField(max_length=100)
-    image_fstypes = models.CharField(max_length=100)
-    distro = models.CharField(max_length=100)
-    distro_version = models.CharField(max_length=100)
-    started_on = models.DateTimeField()
-    completed_on = models.DateTimeField()
-    outcome = models.IntegerField(choices=BUILD_OUTCOME, default=IN_PROGRESS)
-    errors_no = models.IntegerField(default=0)
-    warnings_no = models.IntegerField(default=0)
-    cooker_log_path = models.CharField(max_length=500)
-    build_name = models.CharField(max_length=100)
-    bitbake_version = models.CharField(max_length=50)
-
-@python_2_unicode_compatible
-class Target(models.Model):
-    search_allowed_fields = ['target', 'image_fstypes', 'file_name']
-    build = models.ForeignKey(Build)
-    target = models.CharField(max_length=100)
-    is_image = models.BooleanField(default = False)
-    file_name = models.CharField(max_length=100)
-    file_size = models.IntegerField()
-
-    def __str__(self):
-        return self.target
-
-
-class Task(models.Model):
-
-    SSTATE_NA = 0
-    SSTATE_MISS = 1
-    SSTATE_FAILED = 2
-    SSTATE_RESTORED = 3
-
-    SSTATE_RESULT = (
-        (SSTATE_NA, 'Not Applicable'), # For rest of tasks, but they still need checking.
-        (SSTATE_MISS, 'Missing'), # it is a miss
-        (SSTATE_FAILED, 'Failed'), # there was a pkg, but the script failed
-        (SSTATE_RESTORED, 'Restored'), # succesfully restored
-    )
-
-    CODING_NA = 0
-    CODING_NOEXEC = 1
-    CODING_PYTHON = 2
-    CODING_SHELL = 3
-
-    TASK_CODING = (
-        (CODING_NA, 'N/A'),
-        (CODING_NOEXEC, 'NoExec'),
-        (CODING_PYTHON, 'Python'),
-        (CODING_SHELL, 'Shell'),
-    )
-
-    OUTCOME_SUCCESS = 0
-    OUTCOME_COVERED = 1
-    OUTCOME_SSTATE = 2
-    OUTCOME_EXISTING = 3
-    OUTCOME_FAILED = 4
-    OUTCOME_NA = 5
-
-    TASK_OUTCOME = (
-        (OUTCOME_SUCCESS, 'Succeeded'),
-        (OUTCOME_COVERED, 'Covered'),
-        (OUTCOME_SSTATE, 'Sstate'),
-        (OUTCOME_EXISTING, 'Existing'),
-        (OUTCOME_FAILED, 'Failed'),
-        (OUTCOME_NA, 'Not Available'),
-    )
-
-    build = models.ForeignKey(Build, related_name='task_build')
-    order = models.IntegerField(null=True)
-    task_executed = models.BooleanField(default=False) # True means Executed, False means Prebuilt
-    outcome = models.IntegerField(choices=TASK_OUTCOME, default=OUTCOME_NA)
-    sstate_checksum = models.CharField(max_length=100, blank=True)
-    path_to_sstate_obj = models.FilePathField(max_length=500, blank=True)
-    recipe = models.ForeignKey('Recipe', related_name='build_recipe')
-    task_name = models.CharField(max_length=100)
-    source_url = models.FilePathField(max_length=255, blank=True)
-    work_directory = models.FilePathField(max_length=255, blank=True)
-    script_type = models.IntegerField(choices=TASK_CODING, default=CODING_NA)
-    line_number = models.IntegerField(default=0)
-    disk_io = models.IntegerField(null=True)
-    cpu_usage = models.DecimalField(max_digits=6, decimal_places=2, null=True)
-    elapsed_time = models.CharField(max_length=50, default=0)
-    sstate_result = models.IntegerField(choices=SSTATE_RESULT, default=SSTATE_NA)
-    message = models.CharField(max_length=240)
-    logfile = models.FilePathField(max_length=255, blank=True)
-
-    class Meta:
-        ordering = ('order', 'recipe' ,)
-
-
-class Task_Dependency(models.Model):
-    task = models.ForeignKey(Task, related_name='task_dependencies_task')
-    depends_on = models.ForeignKey(Task, related_name='task_dependencies_depends')
-
-
-class Build_Package(models.Model):
-    build = models.ForeignKey('Build')
-    recipe = models.ForeignKey('Recipe', null=True)
-    name = models.CharField(max_length=100)
-    version = models.CharField(max_length=100, blank=True)
-    revision = models.CharField(max_length=32, blank=True)
-    summary = models.CharField(max_length=200, blank=True)
-    description = models.CharField(max_length=200, blank=True)
-    size = models.IntegerField(default=0)
-    section = models.CharField(max_length=80, blank=True)
-    license = models.CharField(max_length=80, blank=True)
-
-class Build_Package_Dependency(models.Model):
-    TYPE_RDEPENDS = 0
-    TYPE_RPROVIDES = 1
-    TYPE_RRECOMMENDS = 2
-    TYPE_RSUGGESTS = 3
-    TYPE_RREPLACES = 4
-    TYPE_RCONFLICTS = 5
-    DEPENDS_TYPE = (
-        (TYPE_RDEPENDS, "rdepends"),
-        (TYPE_RPROVIDES, "rprovides"),
-        (TYPE_RRECOMMENDS, "rrecommends"),
-        (TYPE_RSUGGESTS, "rsuggests"),
-        (TYPE_RREPLACES, "rreplaces"),
-        (TYPE_RCONFLICTS, "rconflicts"),
-    )
-    package = models.ForeignKey(Build_Package, related_name='bpackage_dependencies_package')
-    depends_on = models.CharField(max_length=100)   # soft dependency
-    dep_type = models.IntegerField(choices=DEPENDS_TYPE)
-
-
-class Target_Package(models.Model):
-    target = models.ForeignKey('Target')
-    recipe = models.ForeignKey('Recipe', null=True)
-    name = models.CharField(max_length=100)
-    version = models.CharField(max_length=100, blank=True)
-    size = models.IntegerField()
-
-
-class Target_Package_Dependency(models.Model):
-    TYPE_DEPENDS = 0
-    TYPE_RDEPENDS = 1
-    TYPE_RECOMMENDS = 2
-
-    DEPENDS_TYPE = (
-        (TYPE_DEPENDS, "depends"),
-        (TYPE_RDEPENDS, "rdepends"),
-        (TYPE_RECOMMENDS, "recommends"),
-    )
-    package = models.ForeignKey(Target_Package, related_name='tpackage_dependencies_package')
-    depends_on = models.ForeignKey(Target_Package, related_name='tpackage_dependencies_depends')
-    dep_type = models.IntegerField(choices=DEPENDS_TYPE)
-
-
-class Build_File(models.Model):
-    bpackage = models.ForeignKey(Build_Package, related_name='filelist_bpackage')
-    path = models.FilePathField(max_length=255, blank=True)
-    size = models.IntegerField()
-
-class Target_File(models.Model):
-    tpackage = models.ForeignKey(Target_Package, related_name='filelist_tpackage')
-    path = models.FilePathField(max_length=255, blank=True)
-    size = models.IntegerField()
-
-
-class Recipe(models.Model):
-    name = models.CharField(max_length=100, blank=True)
-    version = models.CharField(max_length=100, blank=True)
-    layer_version = models.ForeignKey('Layer_Version', related_name='recipe_layer_version')
-    summary = models.CharField(max_length=100, blank=True)
-    description = models.CharField(max_length=100, blank=True)
-    section = models.CharField(max_length=100, blank=True)
-    license = models.CharField(max_length=200, blank=True)
-    licensing_info = models.TextField(blank=True)
-    homepage = models.URLField(blank=True)
-    bugtracker = models.URLField(blank=True)
-    file_path = models.FilePathField(max_length=255)
-
-
-class Recipe_Dependency(models.Model):
-    TYPE_DEPENDS = 0
-    TYPE_RDEPENDS = 1
-
-    DEPENDS_TYPE = (
-        (TYPE_DEPENDS, "depends"),
-        (TYPE_RDEPENDS, "rdepends"),
-    )
-    recipe = models.ForeignKey(Recipe, related_name='r_dependencies_recipe')
-    depends_on = models.ForeignKey(Recipe, related_name='r_dependencies_depends')
-    dep_type = models.IntegerField(choices=DEPENDS_TYPE)
-
-class Layer(models.Model):
-    name = models.CharField(max_length=100)
-    local_path = models.FilePathField(max_length=255)
-    layer_index_url = models.URLField()
-
-
-class Layer_Version(models.Model):
-    layer = models.ForeignKey(Layer, related_name='layer_version_layer')
-    branch = models.CharField(max_length=50)
-    commit = models.CharField(max_length=100)
-    priority = models.IntegerField()
-
-
-class Variable(models.Model):
-    build = models.ForeignKey(Build, related_name='variable_build')
-    variable_name = models.CharField(max_length=100)
-    variable_value = models.TextField(blank=True)
-    changed = models.BooleanField(default=False)
-    human_readable_name = models.CharField(max_length=200)
-    description = models.TextField(blank=True)
-
-class VariableHistory(models.Model):
-    variable = models.ForeignKey(Variable)
-    file_name = models.FilePathField(max_length=255)
-    line_number = models.IntegerField(null=True)
-    operation = models.CharField(max_length=16)
-
-class LogMessage(models.Model):
-    INFO = 0
-    WARNING = 1
-    ERROR = 2
-
-    LOG_LEVEL = ( (INFO, "info"),
-            (WARNING, "warn"),
-            (ERROR, "error") )
-
-    build = models.ForeignKey(Build)
-    level = models.IntegerField(choices=LOG_LEVEL, default=INFO)
-    message=models.CharField(max_length=240)
-    pathname = models.FilePathField(max_length=255, blank=True)
-    lineno = models.IntegerField(null=True)

bitbake/lib/toaster/toastergui/templates/index.html

@@ -1,13 +0,0 @@
-<html>
-<head>
-	<title>GUI Page</title>
-</head>
-<body>
-{% load staticfiles %}
-
-<img src="{% static "/static/images/yocto.jpg" %}" alt="Yocto"/>
-
-This is your basic index page!
-</body>
-
-</html>

bitbake/lib/toaster/toastergui/urls.py

@@ -1,27 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-import os
-
-from django.conf import settings
-from django.conf.urls import patterns, include, url
-
-
-urlpatterns = patterns('toastergui.views',
-        url(r'^$', 'guihome', name='guihome'),
-)

bitbake/lib/toaster/toastergui/views.py

@@ -1,26 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from django.shortcuts import render
-from orm.models import Build, Task
-
-
-def guihome(request):
-    template = 'index.html'
-
-    return render(request, template)

bitbake/lib/toaster/toastermain/settings.py

@@ -1,191 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Django settings for Toaster project.
-
-DEBUG = True
-TEMPLATE_DEBUG = DEBUG
-
-ADMINS = (
-    # ('Your Name', 'your_email@example.com'),
-)
-
-MANAGERS = ADMINS
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': 'toaster.sqlite',                      # Or path to database file if using sqlite3.
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '127.0.0.1',                      # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP.
-        'PORT': '3306',                      # Set to empty string for default.
-    }
-}
-
-# Hosts/domain names that are valid for this site; required if DEBUG is False
-# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = []
-
-# Local time zone for this installation. Choices can be found here:
-# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
-# although not all choices may be available on all operating systems.
-# In a Windows environment this must be set to your system time zone.
-
-# Always use local computer's time zone
-import time
-TIME_ZONE = time.tzname[0]
-
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
-LANGUAGE_CODE = 'en-us'
-
-SITE_ID = 1
-
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
-USE_I18N = True
-
-# If you set this to False, Django will not format dates, numbers and
-# calendars according to the current locale.
-USE_L10N = True
-
-# If you set this to False, Django will not use timezone-aware datetimes.
-USE_TZ = True
-
-# Absolute filesystem path to the directory that will hold user-uploaded files.
-# Example: "/var/www/example.com/media/"
-MEDIA_ROOT = ''
-
-# URL that handles the media served from MEDIA_ROOT. Make sure to use a
-# trailing slash.
-# Examples: "http://example.com/media/", "http://media.example.com/"
-MEDIA_URL = ''
-
-# Absolute path to the directory static files should be collected to.
-# Don't put anything in this directory yourself; store your static files
-# in apps' "static/" subdirectories and in STATICFILES_DIRS.
-# Example: "/var/www/example.com/static/"
-STATIC_ROOT = ''
-
-# URL prefix for static files.
-# Example: "http://example.com/static/", "http://static.example.com/"
-STATIC_URL = '/static/'
-
-# Additional locations of static files
-STATICFILES_DIRS = (
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-# List of finder classes that know how to find static files in
-# various locations.
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
-)
-
-# Make this unique, and don't share it with anybody.
-SECRET_KEY = 'NOT_SUITABLE_FOR_HOSTED_DEPLOYMENT'
-
-# List of callables that know how to import templates from various sources.
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    # Uncomment the next line for simple clickjacking protection:
-    # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-ROOT_URLCONF = 'toastermain.urls'
-
-# Python dotted path to the WSGI application used by Django's runserver.
-WSGI_APPLICATION = 'toastermain.wsgi.application'
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-)
-
-INSTALLED_APPS = (
-    #'django.contrib.auth',
-    #'django.contrib.contenttypes',
-    #'django.contrib.sessions',
-    #'django.contrib.sites',
-    #'django.contrib.messages',
-    'django.contrib.staticfiles',
-    # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
-    # Uncomment the next line to enable admin documentation:
-    # 'django.contrib.admindocs',
-    'orm',
-    'toastermain',
-    'bldviewer',
-    'toastergui',
-)
-
-# A sample logging configuration. The only tangible logging
-# performed by this configuration is to send an email to
-# the site admins on every HTTP 500 error when DEBUG=False.
-# See http://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
-        }
-    },
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    }
-}
-
-# If we're using sqlite, we need to tweak the performance a bit
-from django.db.backends.signals import connection_created
-def activate_synchronous_off(sender, connection, **kwargs):
-    if connection.vendor == 'sqlite':
-        cursor = connection.cursor()
-        cursor.execute('PRAGMA synchronous = 0;')
-connection_created.connect(activate_synchronous_off)
-#
-
-

bitbake/lib/toaster/toastermain/urls.py

@@ -1,41 +0,0 @@
-#
-# BitBake Toaster Implementation
-#
-# Copyright (C) 2013        Intel Corporation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-from django.conf.urls import patterns, include, url
-from django.views.generic.simple import redirect_to
-from django.views.decorators.cache import never_cache
-
-
-# Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
-
-urlpatterns = patterns('',
-    url(r'^simple/', include('bldviewer.urls')),
-    url(r'^api/1.0/', include('bldviewer.api')),
-    url(r'^gui/', include('toastergui.urls')),
-    url(r'^$', never_cache(redirect_to), {'url': '/simple/'}),
-    # Examples:
-    # url(r'^toaster/', include('toaster.foo.urls')),
-
-    # Uncomment the admin/doc line below to enable admin documentation:
-    # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-
-    # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
-)

bitbake/lib/toaster/toastermain/wsgi.py

@@ -1,32 +0,0 @@
-"""
-WSGI config for Toaster project.
-
-This module contains the WSGI application used by Django's development server
-and any production WSGI deployments. It should expose a module-level variable
-named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
-this application via the ``WSGI_APPLICATION`` setting.
-
-Usually you will have the standard Django WSGI application here, but it also
-might make sense to replace the whole Django WSGI application with a custom one
-that later delegates to the Django one. For example, you could introduce WSGI
-middleware here, or combine a Django application with an application of another
-framework.
-
-"""
-import os
-
-# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
-# if running multiple sites in the same mod_wsgi process. To fix this, use
-# mod_wsgi daemon mode with each site in its own daemon process, or use
-# os.environ["DJANGO_SETTINGS_MODULE"] = "Toaster.settings"
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "toastermain.settings")
-
-# This application object is used by any WSGI server configured to use this
-# file. This includes Django's development server, if the WSGI_APPLICATION
-# setting points here.
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()
-
-# Apply WSGI middleware here.
-# from helloworld.wsgi import HelloWorldApplication
-# application = HelloWorldApplication(application)

documentation/adt-manual/adt-manual.xml

@@ -68,13 +68,23 @@
             </revision>
             <revision>
                 <revnumber>1.5.1</revnumber>
-                <date>Sometime in 2013</date>
+                <date>January 2014</date>
                 <revremark>Released with the Yocto Project 1.5.1 Release.</revremark>
             </revision>
             <revision>
-                <revnumber>1.6</revnumber>
-                <date>Sometime 2014</date>
-                <revremark>Released with the Yocto Project 1.6 Release.</revremark>
+                <revnumber>1.5.2</revnumber>
+                <date>May 2014</date>
+                <revremark>Released with the Yocto Project 1.5.2 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.5.3</revnumber>
+                <date>July 2014</date>
+                <revremark>Released with the Yocto Project 1.5.3 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.5.4</revnumber>
+                <date>December 2014</date>
+                <revremark>Released with the Yocto Project 1.5.4 Release.</revremark>
             </revision>
        </revhistory>
 

documentation/adt-manual/adt-prepare.xml

@@ -201,10 +201,7 @@
 
             <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'>
      $ cd adt-installer
      $ ./adt_installer

documentation/bsp-guide/bsp-guide.xml

@@ -80,13 +80,23 @@
             </revision>
             <revision>
                 <revnumber>1.5.1</revnumber>
-                <date>Sometime in 2013</date>
+                <date>January 2014</date>
                 <revremark>Released with the Yocto Project 1.5.1 Release.</revremark>
             </revision>
             <revision>
-                <revnumber>1.6</revnumber>
-                <date>Sometime 2014</date>
-                <revremark>Released with the Yocto Project 1.6 Release.</revremark>
+                <revnumber>1.5.2</revnumber>
+                <date>May 2014</date>
+                <revremark>Released with the Yocto Project 1.5.2 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.5.3</revnumber>
+                <date>July 2014</date>
+                <revremark>Released with the Yocto Project 1.5.3 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.5.4</revnumber>
+                <date>December 2014</date>
+                <revremark>Released with the Yocto Project 1.5.4 Release.</revremark>
             </revision>
         </revhistory>
 

documentation/dev-manual/dev-manual-common-tasks.xml

@@ -1927,6 +1927,732 @@
         </section>
     </section>
 
+    <section id='creating-partitioned-images'>
+        <title>Creating Partitioned Images</title>
+
+        <para>
+            Creating an image for a particular hardware target using the
+            OpenEmbedded build system does not necessarily mean you can boot
+            that image as is on your device.
+            Physical devices accept and boot images in various ways depending
+            on the specifics of the device.
+            Usually, information about the hardware can tell you what image
+            format the device requires.
+            Should your device require multiple partitions on an SD card, flash,
+            or an HDD, you can use the OpenEmbedded Image Creator
+            to create the properly partitioned image.
+        </para>
+
+        <para>
+            The <filename>wic</filename> command generates partitioned images
+            from existing OpenEmbedded build artifacts.
+            Image generation is driven by partitioning commands contained
+            in an Openembedded kickstart file (<filename>.wks</filename>)
+            specified either directly on the command-line or as one of a
+            selection of canned <filename>.wks</filename> files as shown
+            with the <filename>wic list images</filename> command in the
+            "<link linkend='using-a-provided-kickstart_file'>Using a Provided Kickstart File</link>"
+            section.
+            When applied to a given set of build artifacts, the result is an
+            image or set of images that can be directly written onto media and
+            used on a particular system.
+        </para>
+
+        <para>
+            This section provides some background information on
+            <filename>wic</filename>, describes what you need to have in
+            place to run the tool, provides instruction on how to use
+            <filename>wic</filename>, and provides several examples.
+        </para>
+
+        <section id='wic-background'>
+            <title>Background</title>
+
+            <para>
+                This section provides some background on the
+                <filename>wic</filename> utility.
+                While none of this information is required to use
+                <filename>wic</filename>, you might find it interesting.
+                <itemizedlist>
+                    <listitem><para>
+                        The name "wic" is derived from OpenEmbedded
+                        Image Creator (oeic).
+                        The "oe" diphthong in "oeic" was promoted to the
+                        letter "w", because "oeic" is both difficult to remember and
+                        pronounce.</para></listitem>
+                    <listitem><para>
+                        <filename>wic</filename> is loosely based on the
+                        Meego Image Creator (<filename>mic</filename>)
+                        framework.
+                        The <filename>wic</filename> implementation has been
+                        heavily modified to make direct use of OpenEmbedded
+                        build artifacts instead of package installation and
+                        configuration, which are already incorporated within
+                        the OpenEmbedded artifacts.</para></listitem>
+                    <listitem><para>
+                        <filename>wic</filename> is a completely independent
+                        standalone utility that initially provides
+                        easier-to-use and more flexible replacements for a
+                        couple bits of existing functionality in OE Core's
+                        <filename>directdisk.bbclass</filename> and
+                        <filename>mkefidisk.sh</filename> script.
+                        The replaced scripts are implemented by a
+                        general-purpose partitioning language based on Red Hat
+                        kickstart syntax.
+                        Underlying code for <filename>wic</filename> succeeded
+                        from several projects over time.</para></listitem>
+                </itemizedlist>
+            </para>
+        </section>
+
+        <section id='wic-requirements'>
+            <title>Requirements</title>
+
+            <para>
+                In order to use the <filename>wic</filename> utility with the
+                OpenEmbedded Build system, you need to meet the following
+                requirements:
+                <itemizedlist>
+                    <listitem><para>The Linux distribution on your
+                        development host must support the Yocto Project.
+                        See the
+                        "<ulink url='&YOCTO_DOCS_REF_URL;#detailed-supported-distros'>Supported Linux Distributions</ulink>"
+                        section in the Yocto Project Reference Manual for this
+                        list of distributions.</para></listitem>
+                    <listitem><para>
+                        The standard system utilities, such as
+                        <filename>cp</filename>, must be installed on your
+                        development host system.
+                        </para></listitem>
+                    <listitem><para>
+                        The
+                        <ulink url='http://www.gnu.org/software/parted/'>GNU Parted</ulink>
+                        package must be installed on your development host
+                        system.
+                        </para></listitem>
+                    <listitem><para>
+                        Have the build artifacts already available.
+                        You must already have created an image using the
+                        Openembedded build system (e.g.
+                        <filename>core-image-minimal</filename>.
+                        It might seem redundant to generate an image in order
+                        to create an image using <filename>wic</filename>,
+                        but the artifacts are needed and they are generated
+                        with the build system.</para></listitem>
+                    <listitem><para>
+                        You must have sourced one of the build environment
+                        setup scripts (i.e.
+                        <ulink url='&YOCTO_DOCS_REF_URL;#structure-core-script'><filename>&OE_INIT_FILE;</filename></ulink>
+                        or
+                        <ulink url='&YOCTO_DOCS_REF_URL;#structure-memres-core-script'><filename>oe-init-build-env-memres</filename></ulink>)
+                        found in the
+                        <link linkend='build-directory'>Build Directory</link>.
+                        </para></listitem>
+                </itemizedlist>
+            </para>
+        </section>
+
+        <section id='wic-getting-help'>
+            <title>Getting Help</title>
+
+            <para>
+                You can get general help for the <filename>wic</filename>
+                by entering the <filename>wic</filename> command by itself
+                or by entering the command with a help argument as follows:
+                <literallayout class='monospaced'>
+     $ wic -h
+     $ wic --help
+                </literallayout>
+            </para>
+
+            <para>
+                Currently, <filename>wic</filename> supports two commands:
+                <filename>create</filename> and <filename>list</filename>.
+                You can get help for these commands as follows:
+                <literallayout class='monospaced'>
+     $ wic help &lt;command&gt;
+                </literallayout>
+            </para>
+
+            <para>
+                You can find more out about the images
+                <filename>wic</filename> creates using the provided
+                kickstart files with the following form of the command:
+                <literallayout class='monospaced'>
+     $ wic list &lt;image&gt; help
+                </literallayout>
+                Where <filename>&lt;image&gt;</filename> is either
+                <filename>directdisk</filename> or
+                <filename>mkefidisk</filename>.
+            </para>
+        </section>
+
+        <section id='operational-modes'>
+            <title>Operational Modes</title>
+
+            <para>
+                You can run <filename>wic</filename> in two modes: Raw and
+                Cooked:
+                <itemizedlist>
+                    <listitem><para><emphasis>Raw Mode:</emphasis>
+                        You explicitly specify build artifacts through
+                        command-line arguments.</para></listitem>
+                    <listitem><para><emphasis>Cooked Mode:</emphasis>
+                        The current
+                        <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink>
+                        setting and image name are used to automatically locate
+                        and provide the build artifacts.</para></listitem>
+                </itemizedlist>
+            </para>
+
+            <para>
+                Regardless of the mode you use, you need to have the build
+                artifacts ready and available.
+                Additionally, the environment must be set up using the
+                <ulink url='&YOCTO_DOCS_REF_URL;#structure-core-script'><filename>&OE_INIT_FILE;</filename></ulink>
+                or
+                <ulink url='&YOCTO_DOCS_REF_URL;#structure-memres-core-script'><filename>oe-init-build-env-memres</filename></ulink>
+                script found in the
+                <link linkend='build-directory'>Build Directory</link>.
+            </para>
+
+            <section id='raw-mode'>
+                <title>Raw Mode</title>
+
+                <para>
+                    The general form of the 'wic' command in raw mode is:
+                    <literallayout class='monospaced'>
+     $ wic create <replaceable>image_name</replaceable>.wks [<replaceable>options</replaceable>] [...]
+
+         Where:
+
+             <replaceable>image_name</replaceable>.wks
+                               An an OpenEmbedded kickstart file.  You can provide
+                               your own custom file or use a file from a set of
+                               provided files as described by further options.
+
+             -o <replaceable>OUTDIR</replaceable>, --outdir=<replaceable>OUTDIR</replaceable>
+                               The name of a directory in which to create image.
+
+             -i <replaceable>PROPERTIES_FILE</replaceable>, --infile=<replaceable>PROPERTIES_FILE</replaceable>
+                               The name of a file containing the values for image
+                               properties as a JSON file.
+
+             -e <replaceable>IMAGE_NAME</replaceable>, --image-name=<replaceable>IMAGE_NAME</replaceable>
+                               The name of the image from which to use the artifacts
+                               (e.g. <filename>core-image-sato</filename>).
+
+             -r <replaceable>ROOTFS_DIR</replaceable>, --rootfs-dir=<replaceable>ROOTFS_DIR</replaceable>
+                               The path to the <filename>/rootfs</filename> directory to use as the
+                               <filename>.wks</filename> rootfs source.
+
+             -b <replaceable>BOOTIMG_DIR</replaceable>, --bootimg-dir=<replaceable>BOOTIMG_DIR</replaceable>
+                               The path to the directory containing the boot artifacts
+                               (e.g. <filename>/EFI</filename> or <filename>/syslinux</filename>) to use as the <filename>.wks</filename> bootimg
+                               source.
+
+             -k <replaceable>KERNEL_DIR</replaceable>, --kernel-dir=<replaceable>KERNEL_DIR</replaceable>
+                               The path to the directory containing the kernel to use
+                               in the <filename>.wks</filename> boot image.
+
+             -n <replaceable>NATIVE_SYSROOT</replaceable>, --native-sysroot=<replaceable>NATIVE_SYSROOT</replaceable>
+                               The path to the native sysroot containing the tools to use
+                               to build the image.
+
+             -p, --skip-build-check
+                               Skips the build check.
+
+             -D, --debug
+                               Output debug information.
+                    </literallayout>
+                    <note>
+                        You do not need root privileges to run
+                        <filename>wic</filename>.
+                        In fact, you should not run as root when using the
+                        utility.
+                    </note>
+                </para>
+            </section>
+
+            <section id='cooked-mode'>
+                <title>Cooked Mode</title>
+
+                <para>
+                    The general form of the <filename>wic</filename> command
+                    using Cooked Mode is:
+                    <literallayout class='monospaced'>
+     $ wic create <replaceable>kickstart_file</replaceable> -e <replaceable>image_name</replaceable>
+
+         Where:
+
+             <replaceable>kickstart_file</replaceable>
+                               An OpenEmbedded kickstart file. You can provide your own
+                               custom file or supplied file.
+
+             <replaceable>image_name</replaceable>
+                               Specifies the image built using the OpenEmbedded build
+                               system.
+                    </literallayout>
+                    This form is the simplest and most user-friendly, as it
+                    does not require specifying all individual parameters.
+                    All you need to provide is your own
+                    <filename>.wks</filename> file or one provided with the
+                    release.
+                </para>
+            </section>
+        </section>
+
+        <section id='using-a-provided-kickstart_file'>
+            <title>Using a Provided Kickstart File</title>
+
+            <para>
+                If you do not want to create your own
+                <filename>.wks</filename> file, you can use a provided
+                file.
+                Use the following command to list the available files:
+                <literallayout class='monospaced'>
+     $ wic list images
+     directdisk Create a 'pcbios' direct disk image
+     mkefidisk Create an EFI disk image
+                 </literallayout>
+                 When you use a provided file, you do not have to use the
+                 <filename>.wks</filename> extension.
+                 Here is an example in Raw Mode that uses the
+                 <filename>directdisk</filename> file:
+                 <literallayout class='monospaced'>
+     $ wic create directdisk -r <replaceable>rootfs_dir</replaceable> -b <replaceable>bootimg_dir</replaceable> \
+           -k <replaceable>kernel_dir</replaceable> -n <replaceable>native_sysroot</replaceable>
+                </literallayout>
+            </para>
+
+            <para>
+                Here are the actual partition language commands
+                used in the <filename>mkefidisk.wks</filename> file to generate
+                an image:
+                <literallayout class='monospaced'>
+     # short-description: Create an EFI disk image
+     # long-description: Creates a partitioned EFI disk image that the user
+     # can directly dd to boot media.
+
+     part /boot &dash;&dash;source bootimg-efi &dash;&dash;ondisk sda &dash;&dash;fstype=efi &dash;&dash;active
+
+     part / &dash;&dash;source rootfs &dash;&dash;ondisk sda &dash;&dash;fstype=ext3 &dash;&dash;label platform
+
+     part swap &dash;&dash;ondisk sda &dash;&dash;size 44 &dash;&dash;label swap1 &dash;&dash;fstype=swap
+
+     bootloader  &dash;&dash;timeout=10  &dash;&dash;append="rootwait console=ttyPCH0,115200"
+                </literallayout>
+            </para>
+        </section>
+
+        <section id='wic-usage-examples'>
+            <title>Examples</title>
+
+            <para>
+                This section provides several examples that show how to use
+                the <filename>wic</filename> utility.
+                All the examples assume the list of requirements in the
+                "<link linkend='wic-requirements'>Requirements</link>" section
+                have been met.
+                The examples assume the previously generated image is
+                <filename>core-image-minimal</filename>.
+            </para>
+
+            <section id='generate-an-image-using-a-provided-kickstart-file'>
+                <title>Generate an Image using a Provided Kickstart File</title>
+
+                <para>
+                    This example runs in Cooked Mode and uses the
+                    <filename>mkefidisk</filename> kickstart file:
+                    <literallayout class='monospaced'>
+     $ wic create mkefidisk -e core-image-minimal
+     Checking basic build environment...
+     Done.
+
+     Creating image(s)...
+
+     Info: The new image(s) can be found here:
+      /var/tmp/wic/build/mkefidisk-201310230946-sda.direct
+
+     The following build artifacts were used to create the image(s):
+      ROOTFS_DIR: /home/trz/yocto/yocto-image/build/tmp/work/minnow-poky-linux/core-image-minimal/1.0-r0/rootfs
+      BOOTIMG_DIR: /home/trz/yocto/yocto-image/build/tmp/work/minnow-poky-linux/core-image-minimal/1.0-r0/core-image-minimal-1.0/hddimg
+      KERNEL_DIR: /home/trz/yocto/yocto-image/build/tmp/sysroots/minnow/usr/src/kernel
+      NATIVE_SYSROOT: /home/trz/yocto/yocto-image/build/tmp/sysroots/x86_64-linux
+
+
+     The image(s) were created using OE kickstart file:
+      /home/trz/yocto/yocto-image/scripts/lib/image/canned-wks/mkefidisk.wks
+                    </literallayout>
+                    This example shows the easiest way to create an image
+                    by running in Cooked Mode and using the
+                    <filename>-e</filename> option with a provided kickstart
+                    file.
+                    All that is necessary is to specify the image used to
+                    generate the artifacts.
+                    Your <filename>local.conf</filename> needs to have the
+                    <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink>
+                    variable set to the machine you are using, which is
+                    "minnow" in this example.
+                </para>
+
+                <para>
+                    The output specifies exactly which image was
+                    created as well as where it was created.
+                    The output also names the artifacts used and the exact
+                    <filename>.wks</filename> script that was used to generate
+                    the image.
+                    <note>
+                        You should always verify the details provided in the
+                        output to make sure that the image was indeed created
+                        exactly as expected.
+                    </note>
+                </para>
+
+                <para>
+                    Continuing with the example, you can now directly
+                    <filename>dd</filename> the image to a USB stick, or
+                    whatever media for which you built your image,
+                    and boot the resulting media:
+                    <literallayout class='monospaced'>
+     $ sudo dd if=/var/tmp/wic/build/mkefidisk-201310230946-sda.direct of=/dev/sdb
+     [sudo] password for trz:
+     182274+0 records in
+     182274+0 records out
+     93324288 bytes (93 MB) copied, 14.4777 s, 6.4 MB/s
+     [trz@empanada ~]$ sudo eject /dev/sdb
+                    </literallayout>
+                </para>
+            </section>
+
+            <section id='using-a-modified-kickstart-file'>
+                <title>Using a Modified Kickstart File</title>
+
+                <para>
+                    Because <filename>wic</filename> image creation is driven
+                    by the kickstart file, it is easy to affect image creation
+                    by changing the parameters in the file.
+                    This next example demonstrates that through modification
+                    of the <filename>directdisk</filename> kickstart file.
+                </para>
+
+                <para>
+                    As mentioned earlier, you can use the command
+                    <filename>wic list images</filename> to show the list
+                    of provided kickstart files.
+                    The directory in which these files reside is
+                    <filename>scripts/lib/image/canned-wks/</filename>
+                    located in the
+                    <link linkend='source-directory'>Source Directory</link>.
+                    Because the available files reside in this directory, you
+                    can create and add your own custom files to the directory.
+                    Subsequent use of the <filename>wic list images</filename>
+                    command would then include your kickstart files.
+                </para>
+
+                <para>
+                    In this example, the existing
+                    <filename>directdisk</filename> file already does most
+                    of what is needed.
+                    However, for the hardware in this example, the image will
+                    need to boot from <filename>sdb</filename> instead of
+                    <filename>sda</filename>, which is what the
+                    <filename>directdisk</filename> kickstart file uses.
+                </para>
+
+                <para>
+                    The example begins by making a copy of the
+                    <filename>directdisk.wks</filename> file in the
+                    <filename>scripts/lib/image/canned-wks</filename>
+                    directory and then changing the lines that specify the
+                    target disk from which to boot.
+                    <literallayout class='monospaced'>
+     $ cp /home/trz/yocto/yocto-image/scripts/lib/image/canned-wks/directdisk.wks \
+          /home/trz/yocto/yocto-image/scripts/lib/image/canned-wks/directdisksdb.wks
+                    </literallayout>
+                    Next, the example modifies the
+                    <filename>directdisksdb.wks</filename> file and changes all
+                    instances of "<filename>--ondisk sda</filename>"
+                    to "<filename>--ondisk sdb</filename>".
+                    The example changes the following two lines and leaves the
+                    remaining lines untouched:
+                    <literallayout class='monospaced'>
+     part /boot --source bootimg --ondisk sdb --fstype=msdos --label boot --active --align 1024
+     part / --source rootfs --ondisk sdb --fstype=ext3 --label platform --align 1024
+                    </literallayout>
+                    Once the lines are changed, the example generates the
+                    <filename>directdisksdb</filename> image.
+                    The command points the process at the
+                    <filename>core-image-minimal</filename> artifacts for the
+                    Next Unit of Computing (nuc)
+                    <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink>
+                    the <filename>local.conf</filename>.
+                    <literallayout class='monospaced'>
+     $ wic create directdisksdb -e core-image-minimal
+     Checking basic build environment...
+     Done.
+
+     Creating image(s)...
+
+     Info: The new image(s) can be found here:
+      /var/tmp/wic/build/directdisksdb-201310231131-sdb.direct
+
+     The following build artifacts were used to create the image(s):
+      ROOTFS_DIR: /home/trz/yocto/yocto-image/build/tmp/work/nuc-poky-linux/core-image-minimal/1.0-r0/rootfs
+      BOOTIMG_DIR: /home/trz/yocto/yocto-image/build/tmp/sysroots/nuc/usr/share
+      KERNEL_DIR: /home/trz/yocto/yocto-image/build/tmp/sysroots/nuc/usr/src/kernel
+      NATIVE_SYSROOT: /home/trz/yocto/yocto-image/build/tmp/sysroots/x86_64-linux
+
+
+     The image(s) were created using OE kickstart file:
+      /home/trz/yocto/yocto-image/scripts/lib/image/canned-wks/directdisksdb.wks
+                    </literallayout>
+                    Continuing with the example, you can now directly
+                    <filename>dd</filename> the image to a USB stick, or
+                    whatever media for which you built your image,
+                    and boot the resulting media:
+                    <literallayout class='monospaced'>
+     $ sudo dd if=/var/tmp/wic/build/directdisksdb-201310231131-sdb.direct of=/dev/sdb
+     86018+0 records in
+     86018+0 records out
+     44041216 bytes (44 MB) copied, 13.0734 s, 3.4 MB/s
+     [trz@empanada tmp]$ sudo eject /dev/sdb
+                    </literallayout>
+                </para>
+            </section>
+
+            <section id='creating-an-image-based-on-core-image-minimal-and-crownbay-noemgd'>
+                <title>Creating an Image Based on <filename>core-image-minimal</filename> and <filename>crownbay-noemgd</filename></title>
+
+                <para>
+                    This example creates an image based on
+                    <filename>core-image-minimal</filename> and a
+                    <filename>crownbay-noemgd</filename>
+                    <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink>
+                    that works right out of the box.
+                    <literallayout class='monospaced'>
+     $ wic create directdisk -e core-image-minimal
+
+     Checking basic build environment...
+     Done.
+
+     Creating image(s)...
+
+     Info: The new image(s) can be found here:
+      /var/tmp/wic/build/directdisk-201309252350-sda.direct
+
+     The following build artifacts were used to create the image(s):
+
+     ROOTFS_DIR: /home/trz/yocto/yocto-image/build/tmp/work/crownbay_noemgd-poky-linux/core-image-minimal/1.0-r0/rootfs
+     BOOTIMG_DIR: /home/trz/yocto/yocto-image/build/tmp/sysroots/crownbay-noemgd/usr/share
+     KERNEL_DIR: /home/trz/yocto/yocto-image/build/tmp/sysroots/crownbay-noemgd/usr/src/kernel
+     NATIVE_SYSROOT: /home/trz/yocto/yocto-image/build/tmp/sysroots/crownbay-noemgd/usr/src/kernel
+
+     The image(s) were created using OE kickstart file:
+      /home/trz/yocto/yocto-image/scripts/lib/image/canned-wks/directdisk.wks
+                    </literallayout>
+                </para>
+            </section>
+
+            <section id='using-a-modified-kickstart-file-and-running-in-raw-mode'>
+                <title>Using a Modified Kickstart File and Running in Raw Mode</title>
+
+                <para>
+                    This next example manually specifies each build artifact
+                    (runs in Raw Mode) and uses a modified kickstart file.
+                    The example also uses the <filename>-o</filename> option
+                    to cause <filename>wic</filename> to create the output
+                    somewhere other than the default
+                    <filename>/var/tmp/wic</filename> directory:
+                    <literallayout class='monospaced'>
+     $ wic create ~/test.wks -o /home/trz/testwic --rootfs-dir \
+          /home/trz/yocto/yocto-image/build/tmp/work/crownbay_noemgd-poky-linux/core-image-minimal/1.0-r0/rootfs \
+          --bootimg-dir /home/trz/yocto/yocto-image/build/tmp/sysroots/crownbay-noemgd/usr/share \
+          --kernel-dir /home/trz/yocto/yocto-image/build/tmp/sysroots/crownbay-noemgd/usr/src/kernel \
+          --native-sysroot /home/trz/yocto/yocto-image/build/tmp/sysroots/x86_64-linux
+
+     Creating image(s)...
+
+     Info: The new image(s) can be found here:
+      /home/trz/testwic/build/test-201309260032-sda.direct
+
+     The following build artifacts were used to create the image(s):
+
+     ROOTFS_DIR: /home/trz/yocto/yocto-image/build/tmp/work/crownbay_noemgd-poky-linux/core-image-minimal/1.0-r0/rootfs
+     BOOTIMG_DIR: /home/trz/yocto/yocto-image/build/tmp/sysroots/crownbay-noemgd/usr/share
+     KERNEL_DIR: /home/trz/yocto/yocto-image/build/tmp/sysroots/crownbay-noemgd/usr/src/kernel
+     NATIVE_SYSROOT: /home/trz/yocto/yocto-image/build/tmp/sysroots/crownbay-noemgd/usr/src/kernel
+
+     The image(s) were created using OE kickstart file:
+      /home/trz/test.wks
+                    </literallayout>
+                    For this example,
+                    <ulink url='&YOCTO_DOCS_REF_URL;#var-MACHINE'><filename>MACHINE</filename></ulink>
+                    did not have to be specified in the
+                    <filename>local.conf</filename> file since the artifact is
+                    manually specified.
+                </para>
+            </section>
+        </section>
+
+        <section id='openembedded-kickstart-wks-reference'>
+            <title>OpenEmbedded Kickstart (.wks) Reference</title>
+
+            <para>
+                The current <filename>wic</filename> implementation supports
+                only the basic kickstart partitioning commands:
+                <filename>partition</filename> (or <filename>part</filename>
+                for short) and <filename>bootloader</filename>.
+            </para>
+
+            <para>
+                Following is a listing of the commands, their syntax, and
+                meanings.
+                The commands are based on the Fedora kickstart documentation
+                but with modifications to reflect <filename>wic</filename>
+                capabilities.
+                <literallayout class='monospaced'>
+     http://fedoraproject.org/wiki/Anaconda/Kickstart#part_or_partition
+     http://fedoraproject.org/wiki/Anaconda/Kickstart#bootloader
+                </literallayout>
+            </para>
+
+            <section id='command-part-or-partition'>
+                <title>Command: part or partition</title>
+
+                <para>
+                This command creates a partition on the system and uses the
+                following syntax:
+                    <literallayout class='monospaced'>
+     part &lt;mntpoint&gt;
+                    </literallayout>
+                    The <filename>&lt;mntpoint&gt;</filename> is where the
+                    partition will be mounted and must be of one of the
+                    following forms:
+                    <itemizedlist>
+                        <listitem><para><filename>/&lt;path&gt;</filename>:
+                            For example, <filename>/</filename>,
+                            <filename>/usr</filename>, and
+                            <filename>/home</filename></para></listitem>
+                        <listitem><para><filename>swap</filename>:
+                            The partition will be used as swap space.
+                            </para></listitem>
+                    </itemizedlist>
+                </para>
+
+                <para>
+                    Following are the supported options:
+                    <itemizedlist>
+                        <listitem><para><emphasis><filename>--size</filename>:</emphasis>
+                            The minimum partition size in MBytes.
+                            Specify an integer value such as 500.
+                            Do not append the number with "MB".
+                            You do not need this option if you use
+                            <filename>--source</filename>.</para></listitem>
+                        <listitem><para><emphasis><filename>--source</filename>:</emphasis>
+                            This option is a wic-specific option that can
+                            currently have one of two values, "bootimg" or
+                            "rootfs".</para>
+                            <para>If <filename>--source rootfs</filename> is
+                            used, it tells the <filename>wic</filename> command
+                            to create a partition as large as needed to fill
+                            with the contents of the root filesystem
+                            (specified by the <filename>-r</filename>
+                            <filename>wic</filename> option) and to fill it
+                            with the contents of <filename>/rootfs</filename>.
+                            </para>
+                            <para>If <filename>--source bootimg</filename>
+                            is used, it tells the <filename>wic</filename>
+                            command to create a partition as large as needed to
+                            fill with the contents of the boot partition
+                            (specified by the <filename>-b</filename>
+                            <filename>wic</filename> option).
+                            Exactly what those contents are depend on the value
+                            of the <filename>--fstype</filename> option for
+                            that partition.
+                            If <filename>--fstype=efi</filename> is specified,
+                            the boot artifacts contained in HDDDIR are used,
+                            and if <filename>--fstype=msdos</filename> is
+                            specified, the boot artifacts found in
+                            <filename>STAGING_DATADIR</filename> are used.
+                            </para></listitem>
+                        <listitem><para><emphasis><filename>--ondisk</filename> or <filename>--ondrive</filename>:</emphasis>
+                            Forces the partition to be created on a particular
+                            disk.</para></listitem>
+                        <listitem><para><emphasis><filename>--fstype</filename>:</emphasis>
+                            Sets the file system type for the partition.
+                            Valid values are:
+                            <itemizedlist>
+                                <listitem><para><filename>msdos</filename>
+                                </para></listitem>
+                                <listitem><para><filename>efi</filename>
+                                </para></listitem>
+                                <listitem><para><filename>ext4</filename>
+                                </para></listitem>
+                                <listitem><para><filename>ext3</filename>
+                                </para></listitem>
+                                <listitem><para><filename>ext2</filename>
+                                </para></listitem>
+                                <listitem><para><filename>btrfs</filename>
+                                </para></listitem>
+                                <listitem><para><filename>swap</filename>
+                                </para></listitem>
+                            </itemizedlist></para></listitem>
+                        <listitem><para><emphasis><filename>--label label</filename>:</emphasis>
+                            Specifies the label to give to the filesystem to
+                            be made on the partition.
+                            If the given label is already in use by another
+                            filesystem, a new label is created for the
+                            partition.</para></listitem>
+                        <listitem><para><emphasis><filename>--active</filename>:</emphasis>
+                            Marks the partition as active.</para></listitem>
+                        <listitem><para><emphasis><filename>--align (in KBytes)</filename>:</emphasis>
+                            This option is specific to the Meego Image
+                            Creator (mic) that says to start a partition on an
+                            x KBytes boundary.</para></listitem>
+                    </itemizedlist>
+                </para>
+            </section>
+
+            <section id='command-bootloader'>
+                <title>Command: bootloader</title>
+
+                <para>
+                    This command specifies how the boot loader should be
+                    and supports the following options:
+                    <itemizedlist>
+                        <listitem><para><emphasis><filename>--timeout</filename>:</emphasis>
+                            Specifies the number of seconds before the
+                            bootloader times out and boots the default option.
+                            </para></listitem>
+                        <listitem><para><emphasis><filename>--append</filename>:</emphasis>
+                            Specifies kernel parameters.
+                            These will be added to the syslinux
+                            <filename>APPEND</filename> or
+                            <filename>grub</filename> kernel command line.
+                            </para>
+                            <para>The boot type is determined by the fstype of
+                            the <filename>/boot</filename> mountpoint.
+                            If the fstype is "msdos" the boot type is
+                            "pcbios", otherwise it is the fstype, which
+                            is currently "efi" (more to be added later).
+                            </para>
+                            <para>If the boot type is "efi", the image will
+                            use <filename>grub</filename> and has one
+                            menuentry: "boot".</para>
+                            <para>If the boot type is "pcbios", the image
+                            will use syslinux and has one menu label: "boot".
+                            </para>
+                            <para>Future updates will implement more options.
+                            If you use anything that is not specifically
+                            supported, results can be unpredictable.
+                            </para></listitem>
+                    </itemizedlist>
+                </para>
+            </section>
+        </section>
+    </section>
+
     <section id='configuring-the-kernel'>
         <title>Configuring the Kernel</title>
 
@@ -2983,11 +3709,29 @@
 
             <para>
                 To eliminate all the packaging requirements for an image,
-                be sure that "package-management" is not part of your
-                <ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></ulink>
-                statement for the image.
-                When you remove this feature, you are removing the package
-                manager as well as its dependencies from the root filesystem.
+                follow these steps:
+                <orderedlist>
+                    <listitem><para>Put the following line in your main
+                        recipe for the image to remove package management
+                        data files:
+                        <literallayout class='monospaced'>
+     ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ;
+                        </literallayout>
+                        For example, the recipe for the
+                        <filename>core-image-minimal</filename> image contains
+                        this line.
+                        You can also add the line to the
+                        <filename>local.conf</filename> configuration file.
+                        </para></listitem>
+                    <listitem><para>Be sure that "package-management" is not
+                        part of your
+                        <ulink url='&YOCTO_DOCS_REF_URL;#var-IMAGE_FEATURES'><filename>IMAGE_FEATURES</filename></ulink>
+                        statement for the image.
+                        When you remove this feature, you are removing the
+                        package manager as well as its dependencies
+                        from the root filesystem.
+                        </para></listitem>
+                </orderedlist>
             </para>
         </section>
 
@@ -3237,9 +3981,10 @@
                     The simplest form for a PR Service is for it to exist
                     for a single host development system that builds the
                     package feed (building system).
-                    For this scenario, you can enable the PR Service by adding
-                    the following to your <filename>local.conf</filename>
-                    file in the
+                    For this scenario, you can enable a local PR Service by
+                    setting
+                    <ulink url='&YOCTO_DOCS_REF_URL;#var-PRSERV_HOST'><filename>PRSERV_HOST</filename></ulink>
+                    in your <filename>local.conf</filename> file in the
                     <ulink url='&YOCTO_DOCS_DEV_URL;#build-directory'>Build Directory</ulink>:
                     <literallayout class='monospaced'>
      PRSERV_HOST = "localhost:0"
@@ -4397,12 +5142,12 @@
 
         <para>
             In fact, the Yocto Project provides a distribution named
-            <filename>poky-bleeding</filename>, whose configuration 
+            <filename>poky-bleeding</filename>, whose configuration
             file contains the line:
             <literallayout class='monospaced'>
      require conf/distro/include/poky-floating-revisions.inc
             </literallayout>
-            This line pulls in the listed include file that contains 
+            This line pulls in the listed include file that contains
             numerous lines of exactly that form:
             <literallayout class='monospaced'>
      SRCREV_pn-gconf-dbus ?= "${AUTOREV}"
@@ -4424,14 +5169,14 @@
           .
           .
             </literallayout>
-            These lines allow you to experiment with building a 
-            distribution that tracks the latest development source 
+            These lines allow you to experiment with building a
+            distribution that tracks the latest development source
             for numerous packages.
             <note><title>Caution</title>
                 The <filename>poky-bleeding</filename> distribution
                 is not tested on a regular basis.
                 Keep this in mind if you use it.
-            </note>                
+            </note>
         </para>
     </section>
 
@@ -5425,40 +6170,6 @@
                 dependencies, packages installed in your final image,
                 execution time, CPU usage and disk I/O per task.
             </para>
-
-            <para>
-                The home page of the interface into the database organizes
-                builds into areas:
-                <itemizedlist>
-                    <listitem><para>Recent successful builds, which appear
-                        in row format in a green area.</para></listitem>
-                    <listitem><para>Recent failed builds, which appear
-                        in row format in a red area.</para></listitem>
-                    <listitem><para>Recent builds in progress, which appear
-                        in row format in a yellow area.</para></listitem>
-                    <listitem><para>All builds, which appear in row format at
-                        the end of the page.</para></listitem>
-                </itemizedlist>
-            </para>
-
-            <para>
-                Each entry is linked to more detail on the particular build
-                or recipe.
-                You can click on the links to learn more information.
-            </para>
-
-            <para>
-                When you click on a failed recipe link, you can find out
-                information such as the work directory, the pathname to the
-                failing recipe, the exact error message, and precursor tasks.
-            </para>
-
-            <para>
-                Clicking on a successful build provides you with configuration,
-                task, and package information along with directory structure,
-                build time, CPU usage, and disk I/O information.
-            </para>
-
         </section>
 
         <section id='stopping-toaster'>
@@ -5828,8 +6539,7 @@
                 <link linkend='build-directory'>Build Directory</link>:
                 <literallayout class='monospaced'>
      ARCHIVER_MODE ?= "original"
-     ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if
-     ARCHIVER_MODE != 'none' else ''}"
+     ARCHIVER_CLASS = "${@'archive-${ARCHIVER_MODE}-source' if ARCHIVER_MODE != 'none' else ''}"
      INHERIT += "${ARCHIVER_CLASS}"
      SOURCE_ARCHIVE_PACKAGE_TYPE = "tar"
                 </literallayout>

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

@@ -18,8 +18,7 @@
              "<ulink url='&YOCTO_DOCS_BSP_URL;#creating-a-new-bsp-layer-using-the-yocto-bsp-script'>Creating a New BSP Layer Using the yocto-bsp Script</ulink>"
              section in the Yocto Project Board Support Package (BSP) Developer's Guide.
              For more complete information on how to work with the kernel, see the
-             <ulink url='&YOCTO_DOCS_KERNEL_DEV_URL;'>Yocto Project Linux Kernel
-             Development Manual</ulink>.
+             <ulink url='&YOCTO_DOCS_KERNEL_DEV_URL;'>Yocto Project Linux Kernel Development Manual</ulink>.
              </para></listitem>
          <listitem><para><emphasis>User Application Development:</emphasis>
              User Application Development covers development of applications that you intend
@@ -419,9 +418,8 @@
                         If you have never built the kernel you are interested in, you need to run
                         an initial build to establish local kernel source files.</para>
                         <para>If you are building an image for the first time, you need to get the build
-                        environment ready by sourcing an environment setup script
-                        (e.g. <filename>oe-init-build-env</filename> or
-                        <filename>oe-init-build-env-memres</filename>).
+                        environment ready by sourcing
+                        the environment setup script.
                         You also need to be sure two key configuration files
                         (<filename>local.conf</filename> and <filename>bblayers.conf</filename>)
                         are configured appropriately.</para>

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

@@ -406,22 +406,28 @@
     <title>Yocto Project Source Repositories</title>
 
     <para>
-        The Yocto Project team maintains complete source repositories for all
-        Yocto Project files at
-        <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi'></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 clone
-        a Git repository for that particular item.
-        Having a local Git repository of the Source Directory (poky) allows
-        you to make changes, contribute to the history, and ultimately enhance
-        the Yocto Project's tools, Board Support Packages, and so forth.
+        The Yocto Project team maintains complete source repositories for all Yocto Project files
+        at <ulink url='&YOCTO_GIT_URL;/cgit/cgit.cgi'></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 clone a Git repository for
+        that particular item.
+        Having a local Git repository of the Source Directory (poky) 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>
-        For any supported release of Yocto Project, you can also go to the
+        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
+        and use them within the Yocto Project environment.
+        All that is required is a particular release of the Yocto Project and
+        your application source code.
+    </para>
+
+    <para>
+        For any supported release of Yocto Project, you can go to the
         <ulink url='&YOCTO_HOME_URL;'>Yocto Project Website</ulink> and
         select the "Downloads" tab and get a released tarball of the
         <filename>poky</filename> repository or any supported BSP tarballs.
@@ -686,61 +692,54 @@
                 use the <filename>.bb</filename> file extension.</para></listitem>
             <listitem>
                 <para id='source-directory'><emphasis>Source Directory:</emphasis>
-                This term refers to the directory structure created as a result
-                of creating a local copy of the <filename>poky</filename> Git
-                repository <filename>git://git.yoctoproject.org/poky</filename>
-                or expanding a released <filename>poky</filename> tarball.
-                Sometimes you might hear the term "poky directory" used to refer
-                to this directory structure.
-                <note>
-                    The OpenEmbedded build system does not support file or
-                    directory names that contain spaces.
-                    Be sure that the Source Directory you use does not contain
-                    these types of names.
-                </note></para>
-
-                <para>The Source Directory contains BitBake, Documentation,
-                Metadata and other files that all support the Yocto Project.
-                Consequently, you must have the Source Directory in place on
-                your development system in order to do any development using
-                the Yocto Project.</para>
-
-                <para>When you create a local copy of the Git repository, you
-                can name the repository anything you like.
-                Throughout much of the documentation, <filename>poky</filename>
-                is used as the name of the top-level folder of the local copy of
-                the poky Git repository.
-                So, for example, cloning the <filename>poky</filename> Git
-                repository results in a local Git repository whose top-level
-                folder is also named <filename>poky</filename>.</para>
-
-                <para>While it is not recommended that you use tarball expansion
-                to setup the Source Directory, if you do, the top-level
-                directory name of the Source Directory is derived from the
-                Yocto Project release tarball.
-                For example, downloading and unpacking
-                <filename>&YOCTO_POKY_TARBALL;</filename> results in a
-                Source Directory whose root folder is named
-                <filename>&YOCTO_POKY;</filename>.</para>
-
-                <para>It is important to understand the differences between the
-                Source Directory created by unpacking a released tarball as
-                compared to cloning
+                This term refers to the directory structure created as a result of either downloading
+                and unpacking a Yocto Project release tarball or creating a local copy of
+                the <filename>poky</filename> Git repository
                 <filename>git://git.yoctoproject.org/poky</filename>.
-                When you unpack a tarball, you have an exact copy of the files
-                based on the time of release - a fixed release point.
-                Any changes you make to your local files in the Source Directory
-                are on top of the release and will remain local only.
-                On the other hand, when you clone the <filename>poky</filename>
-                Git repository, you have an active development repository with
-                access to the upstream repository's branches and tags.
-                In this case, any local changes you make to the local
-                Source Directory can be later applied to active development
-                branches of the upstream <filename>poky</filename> Git
+                Sometimes you might hear the term "poky directory" used to refer to this
+                directory structure.
+                <note>
+                    The OpenEmbedded build system does not support file or directory names that
+                    contain spaces.
+                    Be sure that the Source Directory you use does not contain these types
+                    of names.
+                </note></para>
+                <para>The Source Directory contains BitBake, Documentation, Metadata and
+                other files that all support the Yocto Project.
+                Consequently, you must have the Source Directory in place on your development
+                system in order to do any development using the Yocto Project.</para>
+
+                <para>For tarball expansion, the name of the top-level directory of the Source Directory
+                is derived from the Yocto Project release tarball.
+                For example, downloading and unpacking <filename>&YOCTO_POKY_TARBALL;</filename>
+                results in a Source Directory whose top-level folder is named
+                <filename>&YOCTO_POKY;</filename>.
+                If you create a local copy of the Git repository, you can name the repository
+                anything you like.
+                Throughout much of the documentation, <filename>poky</filename> is used as the name of
+                the top-level folder of the local copy of the poky Git repository.
+                So, for example, cloning the <filename>poky</filename> Git repository results in a
+                local Git repository whose top-level folder is also named <filename>poky</filename>.</para>
+
+                <para>It is important to understand the differences between the Source Directory created
+                by unpacking a released tarball as compared to cloning
+                <filename>git://git.yoctoproject.org/poky</filename>.
+                When you unpack a tarball, you have an exact copy of the files based on the time of
+                release - a fixed release point.
+                Any changes you make to your local files in the Source Directory are on top of the release.
+                On the other hand, when you clone the <filename>poky</filename> Git repository, you have an
+                active development repository.
+                In this case, any local changes you make to the Source Directory can be later applied
+                to active development branches of the upstream <filename>poky</filename> Git
                 repository.</para>
 
-                <para>For more information on concepts related to Git
-                repositories, branches, and tags, see the
+                <para>Finally, if you want to track a set of local changes while starting from the same point
+                as a release tarball, you can create a local Git branch that
+                reflects the exact copy of the files at the time of their release.
+                You do this by using Git tags that are part of the repository.</para>
+
+                <para>For more information on concepts related to Git repositories, branches, and tags,
+                see the
                 "<link linkend='repositories-tags-and-branches'>Repositories, Tags, and Branches</link>"
                 section.</para></listitem>
             <listitem><para><emphasis>Task:</emphasis>

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

@@ -57,8 +57,8 @@
     <para>
         Here is what you need to use the Yocto Project:
         <itemizedlist>
-            <listitem><para><emphasis>Host System:</emphasis>  You should have a reasonably current
-                Linux-based host system.
+            <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, Debian, Ubuntu, or CentOS as these releases are frequently tested against the Yocto Project
                 and officially supported.
@@ -69,15 +69,15 @@
                 <para>
                 You should also have about 100 gigabytes of free disk space for building images.
                 </para></listitem>
-            <listitem><para><emphasis>Packages:</emphasis>  The OpenEmbedded build system
-                requires that certain packages exist on your development system (e.g. Python 2.6 or 2.7).
+            <listitem><para><emphasis>Packages:</emphasis>
+                The OpenEmbedded build system requires that 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 and the
                 "<ulink url='&YOCTO_DOCS_REF_URL;#required-packages-for-the-host-development-system'>Required Packages for the Host Development System</ulink>"
                 section in the Yocto Project Reference Manual for the exact
                 package requirements and the installation commands to install
-                them for the supported distributions.
-                </para></listitem>
+                them 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 installed locally on
                 your development system.
@@ -86,7 +86,8 @@
                 and is created when you use
                 <link linkend='git'>Git</link> to clone a local copy
                 of the upstream <filename>poky</filename> repository,
-                or when you download an official release of the corresponding tarball.</para>
+                or when you download an official release of the corresponding
+                tarball.</para>
                 <para>Working from a copy of the upstream repository allows you
                 to contribute back into the Yocto Project or simply work with
                 the latest software on a development branch.
@@ -94,18 +95,56 @@
                 a complete history of changes and you are working with a local
                 clone of that repository, you have access to all the Yocto
                 Project development branches and tag names used in the upstream
-                repository.</para>
+                repository.
                 <note>You can view the Yocto Project Source Repositories at
                     <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>
                 </note>
-                <para>The following transcript shows how to clone the
-                <filename>poky</filename> Git repository into the current
-                working directory.
-                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'>
+                <itemizedlist>
+                    <listitem><para><emphasis>Tarball Extraction:</emphasis>
+                        If you are not going to contribute back into the Yocto
+                        Project, you can simply go to the
+                        <ulink url='&YOCTO_HOME_URL;'>Yocto Project Website</ulink>,
+                        select the "Downloads" tab, and choose what you want.
+                        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 local
+                        Source Directory
+                        with a top-level folder named
+                        <filename>&YOCTO_POKY;</filename>:
+                        <literallayout class='monospaced'>
+     $ tar xfj &YOCTO_POKY_TARBALL;
+                        </literallayout></para>
+                        <para>This method does not produce a local Git
+                        repository.
+                        Instead, you simply end up with a snapshot of the
+                        release.</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 upstream
+                        <filename>poky</filename> source repository.
+                        Doing so creates a repository with a complete history
+                        of changes and allows you to easily submit your changes
+                        upstream to the project.
+                        Because you clone the repository, you have access to all
+                        the Yocto Project development branches and tag names
+                        used in the upstream repository.
+                        <note>You can view the Yocto Project Source Repositories
+                            at
+                            <ulink url='&YOCTO_GIT_URL;/cgit.cgi'></ulink>
+                        </note></para>
+                        <para>The following transcript shows how to clone the
+                        <filename>poky</filename> Git repository into the
+                        current working directory.
+                        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'>
      $ git clone git://git.yoctoproject.org/poky
      Cloning into 'poky'...
      remote: Counting objects: 203728, done.
@@ -113,13 +152,15 @@
      remote: Total 203728 (delta 147444), reused 202891 (delta 146614)
      Receiving objects: 100% (203728/203728), 95.54 MiB | 308 KiB/s, done.
      Resolving deltas: 100% (147444/147444), 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'>
-                wiki page</ulink>, which describes how to create both
-                <filename>poky</filename> and <filename>meta-intel</filename>
-                Git repositories.</para></listitem>
+                        </literallayout>
+                        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'>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>Yocto Project Kernel:</emphasis>
                 If you are going to be making modifications to a supported Yocto Project kernel, you
                 need to establish local copies of the source.
@@ -142,7 +183,7 @@
                 <filename>linux-yocto-3.10.git</filename>, while the
                 copy is named <filename>my-linux-yocto-3.10-work</filename>:
                 <literallayout class='monospaced'>
-     $ git clone --bare git://git.yoctoproject.org/linux-yocto-3.10 linux-yocto-3.10.git
+     $ git clone &dash;&dash;bare git://git.yoctoproject.org/linux-yocto-3.10 linux-yocto-3.10.git
      Cloning into bare repository 'linux-yocto-3.10.git'...
      remote: Counting objects: 3364487, done.
      remote: Compressing objects: 100% (507178/507178), done.
@@ -185,20 +226,21 @@
                </literallayout></para></listitem>
            <listitem><para id='supported-board-support-packages-(bsps)'><emphasis>Supported Board
                 Support Packages (BSPs):</emphasis>
-                The Yocto Project provides a layer called
-                <filename>meta-intel</filename> and it is maintained in its own
-                separate Git repository.
-                The <filename>meta-intel</filename> layer contains many
-                supported
-                <ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>.
-                </para>
-                <para>The Yocto Project uses the following BSP layer naming
-                scheme:
+                The Yocto Project provides a layer called <filename>meta-intel</filename> and
+                it is maintained in its own separate Git repository.
+                The <filename>meta-intel</filename> layer contains many supported
+                <ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>.</para>
+                <para>Similar considerations exist for setting up the <filename>meta-intel</filename>
+                layer.
+                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 that you used to set up the Source Directory.
+                Regardless of the method you use, the Yocto Project uses the following BSP layer
+                naming scheme:
                 <literallayout class='monospaced'>
      meta-&lt;BSP_name&gt;
                 </literallayout>
-                where <filename>&lt;BSP_name&gt;</filename> is the recognized
-                BSP name.
+                where <filename>&lt;BSP_name&gt;</filename> is the recognized BSP name.
                 Here are some examples:
                 <literallayout class='monospaced'>
      meta-crownbay
@@ -208,20 +250,39 @@
                 See the
                 "<ulink url='&YOCTO_DOCS_BSP_URL;#bsp-layers'>BSP Layers</ulink>"
                 section in the Yocto Project Board Support Package (BSP)
-                Developer's Guide for more information on BSP Layers.</para>
-                <para>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>Using
-                <link linkend='git'>Git</link> to create a local clone of the
-                upstream repository can be helpful if you are working with
-                BSPs.
-                Typically, you set up the <filename>meta-intel</filename>
-                Git repository inside the Source Directory.
-                For example, the following transcript shows the steps to clone
-                <filename>meta-intel</filename>.
-                <literallayout class='monospaced'>
+                Developer's Guide for more information on BSP Layers.
+                <itemizedlist>
+                    <listitem><para><emphasis>Tarball Extraction:</emphasis>
+                        You can download any released BSP tarball from the same
+                        "Downloads" page of the Yocto Project
+                        <ulink url='https://www.yoctoproject.org/downloads'>Website</ulink>
+                        to get the Yocto Project release.
+                        Once on the "Download" page, look to the right of the
+                        page and scroll down to find the BSP tarballs.</para>
+                        <para>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 local Git repository for your
+                        Source Directory, 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>Using
+                        <link linkend='git'>Git</link> to create a local clone
+                        of the upstream repository can be helpful if you are
+                        working with BSPs.
+                        Typically, you set up the
+                        <filename>meta-intel</filename> Git repository inside
+                        the Source Directory.
+                        For example, the following transcript shows the steps
+                        to clone <filename>meta-intel</filename>.
+                        <literallayout class='monospaced'>
      $ cd ~/poky
      $ git clone git://git.yoctoproject.org/meta-intel.git
      Cloning into 'meta-intel'...
@@ -230,12 +291,13 @@
      remote: Total 7366 (delta 3997), reused 7299 (delta 3930)
      Receiving objects: 100% (7366/7366), 2.31 MiB | 95 KiB/s, done.
      Resolving deltas: 100% (3997/3997), done.
-                </literallayout></para>
-                <para>The same
-                <ulink url='&YOCTO_WIKI_URL;/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>
+                        </literallayout>
+                        The same
+                        <ulink url='&YOCTO_WIKI_URL;/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.

documentation/dev-manual/dev-manual.xml

@@ -58,13 +58,23 @@
             </revision>
             <revision>
                 <revnumber>1.5.1</revnumber>
-                <date>Sometime in 2013</date>
+                <date>January 2014</date>
                 <revremark>Released with the Yocto Project 1.5.1 Release.</revremark>
             </revision>
             <revision>
-                <revnumber>1.6</revnumber>
-                <date>Sometime 2014</date>
-                <revremark>Released with the Yocto Project 1.6 Release.</revremark>
+                <revnumber>1.5.2</revnumber>
+                <date>May 2014</date>
+                <revremark>Released with the Yocto Project 1.5.2 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.5.3</revnumber>
+                <date>July 2014</date>
+                <revremark>Released with the Yocto Project 1.5.3 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.5.4</revnumber>
+                <date>December 2014</date>
+                <revremark>Released with the Yocto Project 1.5.4 Release.</revremark>
             </revision>
         </revhistory>
 

documentation/kernel-dev/kernel-dev.xml

@@ -43,13 +43,23 @@
             </revision>
             <revision>
                 <revnumber>1.5.1</revnumber>
-                <date>Sometime in 2013</date>
+                <date>January 2014</date>
                 <revremark>Released with the Yocto Project 1.5.1 Release.</revremark>
             </revision>
             <revision>
-                <revnumber>1.6</revnumber>
-                <date>Sometime 2014</date>
-                <revremark>Released with the Yocto Project 1.6 Release.</revremark>
+                <revnumber>1.5.2</revnumber>
+                <date>May 2014</date>
+                <revremark>Released with the Yocto Project 1.5.2 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.5.3</revnumber>
+                <date>July 2014</date>
+                <revremark>Released with the Yocto Project 1.5.3 Release.</revremark>
+            </revision>
+            <revision>
+                <revnumber>1.5.4</revnumber>
+                <date>December 2014</date>
+                <revremark>Released with the Yocto Project 1.5.4 Release.</revremark>
             </revision>
         </revhistory>
 

documentation/poky.ent

@@ -1,9 +1,9 @@
-<!ENTITY DISTRO "1.6">
-<!ENTITY DISTRO_COMPRESSED "16">
-<!ENTITY DISTRO_NAME "tbd">
-<!ENTITY YOCTO_DOC_VERSION "1.6">
-<!ENTITY POKYVERSION "11.0.0">
-<!ENTITY POKYVERSION_COMPRESSED "1100">
+<!ENTITY DISTRO "1.5.4">
+<!ENTITY DISTRO_COMPRESSED "154">
+<!ENTITY DISTRO_NAME "dora">
+<!ENTITY YOCTO_DOC_VERSION "1.5.4">
+<!ENTITY POKYVERSION "10.0.4">
+<!ENTITY POKYVERSION_COMPRESSED "1004">
 <!ENTITY YOCTO_POKY "poky-&DISTRO_NAME;-&POKYVERSION;">
 <!ENTITY COPYRIGHT_YEAR "2010-2014">
 <!ENTITY YOCTO_DL_URL "http://downloads.yoctoproject.org">
@@ -14,9 +14,9 @@
 <!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 YOCTO_RELEASE_NOTES "&YOCTO_HOME_URL;/download/yocto-project-&DISTRO_COMPRESSED;-poky-&POKYVERSION_COMPRESSED;">
+<!ENTITY YOCTO_RELEASE_NOTES "&YOCTO_HOME_URL;/downloads/core/&DISTRO_NAME;&DISTRO_COMPRESSED;">
 <!ENTITY OE_HOME_URL "http://www.openembedded.org">
-<!ENTITY OE_LISTS_URL "http://lists.linuxtogo.org/cgi-bin/mailman">
+<!ENTITY OE_LISTS_URL "http://lists.openembedded.org/mailman">
 <!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/">

documentation/profile-manual/profile-manual-intro.xml

@@ -4,7 +4,7 @@
 
 <chapter id='profile-manual-intro'>
 
-<title>Yocto Project Tracing and Profiling Manual</title>
+<title>Yocto Project Profiling and Tracing Manual</title>
     <section id='intro'>
         <title>Introduction</title>