sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

toaster.bbclass: show packages that were setscened into existence too 

We were previously ignoring pkgs that came in from a setscene like from
an sstate mirror).  With this patch we can use pkgs than come from sstate
for image customisation as well.

Also remove unused variable.

[YOCTO #9137]

(From OE-Core rev: 4ea7f96ae28ff53867f5ffa4158076761676d288)

Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
brian avery 2016-03-10 15:55:54 +00:00 committed by Richard Purdie
parent 39e1351cba
commit 3f8d5bfdfd
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta/classes/toaster.bbclass
View File

@ -112,6 +112,26 @@ 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)
pkgdatadir = d.getVar('PKGDATA_DIR', True)
# scan and send data for each package
lpkgdata = {}
for pkg in packages.split():
try:
lpkgdata = _toaster_load_pkgdatafile(pkgdatadir + "/runtime/", pkg)
except:
# these are typically foo-locale which actually point into foo-locale-<language> in runtime-rprovides
bb.note("toaster_package_dumpdata_setscene: failed to load pkg information for: %s:%s"%(pkg,sys.exc_info()[0]))
# Fire an event containing the pkg data
bb.event.fire(bb.event.MetadataEvent("SinglePackageInfo", lpkgdata), d)
}
python toaster_package_dumpdata() {
"""
@ -120,8 +140,6 @@ python toaster_package_dumpdata() {
# 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
@ -382,6 +400,9 @@ toaster_collect_task_stats[eventmask] = "bb.event.BuildCompleted bb.build.TaskSu
addhandler toaster_buildhistory_dump
toaster_buildhistory_dump[eventmask] = "bb.event.BuildCompleted"
do_packagedata_setscene[postfuncs] += "toaster_package_dumpdata_setscene "
do_packagedata_setscene[vardepsexclude] += "toaster_package_dumpdata_setscene "
do_package[postfuncs] += "toaster_package_dumpdata "
do_package[vardepsexclude] += "toaster_package_dumpdata "