[oe-commits] [openembedded-core] 27/43: toaster.bbclass: show packages that were setscened into existence too
git at git.openembedded.org
git at git.openembedded.org
Thu Mar 10 23:14:59 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit c109a8de4ea6f754554c261cb83794163fc6a429
Author: brian avery <avery.brian at gmail.com>
AuthorDate: Thu Mar 10 15:55:54 2016 +0000
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]
Signed-off-by: brian avery <brian.avery at intel.com>
Signed-off-by: Michael Wood <michael.g.wood at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/toaster.bbclass | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index a17501e..1c0703c 100644
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -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 "
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list