diff options
| -rwxr-xr-x | bitbake/bin/toaster | 2 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/toasterui.py | 14 | ||||
| -rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/toaster.bbclass | 31 |
5 files changed, 45 insertions, 9 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 72eae64166d..89318f0ba77 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -128,7 +128,7 @@ stop_bitbake() { BBSERVER=0.0.0.0:-1 bitbake -m unset BBSERVER # force stop any misbehaving bitbake server - lsof bitbake.lock | awk '{print $2}' | grep "[0-9]\+" | xargs -n1 -r kill + lsof -t bitbake.lock | awk '{print $2}' | grep "[0-9]\+" | xargs -n1 -r kill } verify_prereq() { diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py index 60957740f05..dae1ef04f0f 100644 --- a/bitbake/lib/bb/ui/toasterui.py +++ b/bitbake/lib/bb/ui/toasterui.py @@ -128,7 +128,7 @@ def main(server, eventHandler, params): llevel, debug_domains = bb.msg.constructLogOptions() q = server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list]) logger.warn("seteventmask return is %s",q) - + # verify and warn build_history_enabled = True @@ -185,6 +185,18 @@ def main(server, eventHandler, params): helper.eventHandler(event) logger.info("BAVERY: event: %s ",event.__class__.__name__) + if isinstance(event, (bb.runqueue.sceneQueueTaskStarted, bb.runqueue.runQueueTaskStarted, bb.runqueue.runQueueTaskSkipped)): + logger.info(" BAVERY: event ident: %s:%s ",event.taskfile , event.taskname) + if event.taskname == "do_package": + packages = server.runCommand(["getVariable", "PACKAGES"]) + pkgdest = server.runCommand(["getVariable", "PKGDEST"]) + pkgdatadir = server.runCommand(["getVariable", "PKGDESTWORK"]) + lpkgdata={} + for pkg in packages: + #lpkgdata = _toaster_load_pkgdatafile(pkgdatadir + "/runtime/", pkg) + logger.info(" BAVERY: package datadir:%s package:%s : dest:%s" ,pkgdatadir,pkg,pkgdest) + + # pylint: disable=protected-access # the code will look into the protected variables of the event; no easy way around this diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index efd82c325bc..0e6dd36957e 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -187,7 +187,7 @@ class LocalhostBEController(BuildEnvironmentController): if commit != "HEAD": logger.debug("localhostbecontroller: checking out commit %s to %s " % (commit, localdirname)) ref = commit if re.match('^[a-fA-F0-9]+$', commit) else 'origin/%s' % commit - self._shellcmd('git fetch --all && git reset --hard "%s"' % ref, localdirname) + #self._shellcmd('git fetch --all && git reset --hard "%s"' % ref, localdirname) # take the localdirname as poky dir if we can find the oe-init-build-env if self.pokydirname is None and os.path.exists(os.path.join(localdirname, "oe-init-build-env")): diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index ef80e505b29..fad107d4687 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1041,7 +1041,7 @@ python populate_packages () { bb.utils.mkdirhier(outdir) os.chdir(dvar) - + autodebug = not (d.getVar("NOAUTOPACKAGEDEBUG", True) or False) # Sanity check PACKAGES for duplicates @@ -1594,7 +1594,7 @@ python package_do_shlibs() { bb.note("Renaming %s to %s" % (old, new)) os.rename(old, new) pkgfiles[pkg].remove(old) - + shlibs_file = os.path.join(shlibswork_dir, pkg + ".list") if len(sonames): fd = open(shlibs_file, 'w') @@ -2105,4 +2105,3 @@ def mapping_rename_hook(d): runtime_mapping_rename("RDEPENDS", pkg, d) runtime_mapping_rename("RRECOMMENDS", pkg, d) runtime_mapping_rename("RSUGGESTS", pkg, d) - diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 51a4c74e5b0..533a70b5e01 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -112,23 +112,44 @@ def _toaster_load_pkgdatafile(dirpath, filepath): pass # ignore lines without valid key: value pairs return pkgdata +python toaster_package_dumpdata_setscene() { + """ + Dumps the data created by package_setscene + """ + # replicate variables from the package.bbclass + packages = d.getVar('PACKAGES', True) + pkgdest = d.getVar('PKGDEST', True) + + pkgdatadir = d.getVar('PKGDESTWORK', True) + + # scan and send data for each package + bb.warn("toaster_package_dumpdata_setscene: TOP") + lpkgdata = {} + for pkg in packages.split(): + bb.warn(" toaster_package_dumpdata_setscene: pkg:%s"%(pkg)) + lpkgdata = _toaster_load_pkgdatafile(pkgdatadir + "/runtime/", pkg) + + # Fire an event containing the pkg data + bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d) + +} + python toaster_package_dumpdata() { """ Dumps the data created by emit_pkgdata """ # replicate variables from the package.bbclass - packages = d.getVar('PACKAGES', True) pkgdest = d.getVar('PKGDEST', True) pkgdatadir = d.getVar('PKGDESTWORK', True) # scan and send data for each package - + bb.warn("toaster_package_dumpdata: TOP") lpkgdata = {} for pkg in packages.split(): - + bb.warn(" toaster_package_dumpdata: pkg:%s"%(pkg)) lpkgdata = _toaster_load_pkgdatafile(pkgdatadir + "/runtime/", pkg) # Fire an event containing the pkg data @@ -365,6 +386,10 @@ toaster_buildhistory_dump[eventmask] = "bb.event.BuildCompleted" do_package[postfuncs] += "toaster_package_dumpdata " do_package[vardepsexclude] += "toaster_package_dumpdata " +do_packagedata_setscene[postfuncs] += "toaster_package_dumpdata_setscene " +do_packagedata_setscene[vardepsexclude] += "toaster_package_dumpdata_setscene " + + do_image_complete[postfuncs] += "toaster_image_dumpdata " do_image_complete[vardepsexclude] += "toaster_image_dumpdata " |