[Toaster] [PATCH 1/1] toaster: show packages that were setscened into existence too
Michael Wood
michael.g.wood at intel.com
Thu Mar 10 08:26:58 PST 2016
Thanks sent with some commit messages fixes to openembedded-core
http://lists.openembedded.org/pipermail/openembedded-core/2016-March/118796.html
and pushed to toaster-next
On 08/03/16 05:50, brian avery wrote:
> 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.
> [YOCTO #9137]
>
> Signed-off-by: brian avery <brian.avery at intel.com>
> ---
> 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 51a4c74..4afaf1c 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
> @@ -362,6 +380,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 "
>
More information about the toaster
mailing list