toaster patchset pull request
cover toaster patchset pull request
From: Alexandru DAMIAN <[email protected]>
Hello,
This is a Toaster pull request. The patches have been reviewed on the toaster mailinglist.
Can you please pull ?
Thanks,
Alex
The following changes since commit 8210928e847fda7dbc145a94372b0beaf653a4f9:
yocto-bsps: remove linux-yocto 3.8 bbappend (2014-03-30 23:53:00 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib adamian/20140331-submission
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=adamian/20140331-submission
Alexandru DAMIAN (1):
sstate.bbclass: update missed sstate event
Cristiana Voicu (1):
toaster.bbclass: the license.manifest is located in DEPLOY_DIR
meta/classes/sstate.bbclass | 12 ++++++++++-- meta/classes/toaster.bbclass | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/2 sstate.bbclass: update missed sstate event
From: Alexandru DAMIAN <[email protected]>
This is a patch to update the missed sstate event with info about the sstate files locations that were found. It's needed as to display the found file in the toaster ui.
Also fixes a bug where a setscene task may have appeared in the missed list even if it was found in a sstate mirror.
--- meta/classes/sstate.bbclass | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
meta/classes/sstate.bbclass +10 -2
@@ -690,6 +690,8 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): fetcher.checkstatus() bb.debug(2, "SState: Successful fetch test for %s" % srcuri) ret.append(task) + if task in missed: + missed.remove(task) except: missed.append(task) bb.debug(2, "SState: Unsuccessful fetch test for %s" % srcuri)
@@ -697,9 +699,15 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): inheritlist = d.getVar("INHERIT", True) if "toaster" in inheritlist: - evdata = [] + evdata = {'missed': [], 'found': []}; for task in missed: - evdata.append( (sq_fn[task], sq_task[task], sq_hash[task], generate_sstatefn(spec, sq_hash[task],d) ) ) + spec, extrapath, tname = getpathcomponents(task, d) + sstatefile = d.expand(extrapath + generate_sstatefn(spec, sq_hash[task], d) + "_" + tname + ".tgz") + evdata['missed'].append( (sq_fn[task], sq_task[task], sq_hash[task], sstatefile ) ) + for task in ret: + spec, extrapath, tname = getpathcomponents(task, d) + sstatefile = d.expand(extrapath + generate_sstatefn(spec, sq_hash[task], d) + "_" + tname + ".tgz") + evdata['found'].append( (sq_fn[task], sq_task[task], sq_hash[task], sstatefile ) ) bb.event.fire(bb.event.MetadataEvent("MissedSstate", evdata), d) return ret
Signature · 1 line
1.9.1
PATCH 2/2 toaster.bbclass: the license.manifest is located in DEPLOY_DIR
From: Cristiana Voicu <[email protected]>
Replaced DEPLOY_DIR_IMAGE with DEPLOY_DIR
--- meta/classes/toaster.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/toaster.bbclass +2 -2
@@ -299,10 +299,10 @@ python toaster_buildhistory_dump() { # dump information related to license manifest path python toaster_licensemanifest_dump() { - deploy_dir_image = d.getVar('DEPLOY_DIR_IMAGE', True); + deploy_dir = d.getVar('DEPLOY_DIR', True); image_name = d.getVar('IMAGE_NAME', True); - data = { 'deploy_dir_image' : deploy_dir_image, 'image_name' : image_name } + data = { 'deploy_dir' : deploy_dir, 'image_name' : image_name } bb.event.fire(bb.event.MetadataEvent("LicenseManifestPath", data), d) }
Signature · 1 line
1.9.1