summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-03-27 18:05:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-29 10:40:54 +0000
commit9a3fbf92c4af93cdb66d515c3cd3e64610fbee4a (patch)
tree3dd126c290296e8e58b8e8b525fa70df5b53828f /meta/classes
parent38150f17b44aaa2f8b17eca6a77f0ca597e5327f (diff)
downloadpoky-9a3fbf92c4af93cdb66d515c3cd3e64610fbee4a.tar.gz
classes/buildhistory: improve SRCREV recording
Collect SRCREV information in a separate task and write it out in a format which is more consistent with the rest of the buildhistory output. Using a task means that SRCREV values will also be recorded for native recipes and not just target ones, and the new formatting also correctly handles multiple entries in SRC_URI. Also adds scripts/buildhistory-collect-srcrevs which will report on all of the recorded SRCREV values in a format suitable for use in global configuration (e.g. local.conf or a distro inc file) to override AUTOREV values to a fixed set of revisions. Example output: # emenlow-poky-linux SRCREV_machine_pn-linux-yocto = "b5c37fe6e24eec194bb29d22fdd55d73bcc709bf" SRCREV_emgd_pn-linux-yocto = "caea08c988e0f41103bbe18eafca20348f95da02" SRCREV_meta_pn-linux-yocto = "c2ed0f16fdec628242a682897d5d86df4547cf24" # core2-poky-linux SRCREV_pn-kmod = "62081c0f68905b22f375156d4532fd37fa5c8d33" SRCREV_pn-blktrace = "d6918c8832793b4205ed3bfede78c2f915c23385" SRCREV_pn-opkg = "649" Some notes on using this script: * By default only values where the SRCREV was not hardcoded (usually i.e. AUTOREV was used) are reported - use the -a option to see all SRCREV values. * The output statements may not have any effect in the face of overrides applied elsewhere; use the -f option to add the forcevariable override to each output line to work around this. * The script does not do any special handling for multiple machines; however it does place a comment before each set of values specifying which triplet they belong to as shown above. Relates to [YOCTO #3041]. (From OE-Core rev: 2179db89436d719635f858c87d1e098696bead2a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/buildhistory.bbclass58
1 files changed, 52 insertions, 6 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 4b6be22caa..82d0bf8070 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -259,12 +259,6 @@ def write_recipehistory(rcpinfo, d):
259 f.write("DEPENDS = %s\n" % rcpinfo.depends) 259 f.write("DEPENDS = %s\n" % rcpinfo.depends)
260 f.write("PACKAGES = %s\n" % rcpinfo.packages) 260 f.write("PACKAGES = %s\n" % rcpinfo.packages)
261 261
262 if rcpinfo.srcrev:
263 srcrevfile = os.path.join(pkghistdir, "latest_srcrev")
264 with open(srcrevfile, "w") as f:
265 f.write(','.join([rcpinfo.bbfile, rcpinfo.src_uri, rcpinfo.srcrev,
266 rcpinfo.srcrev_autorev]))
267
268 262
269def write_pkghistory(pkginfo, d): 263def write_pkghistory(pkginfo, d):
270 bb.debug(2, "Writing package history for package %s" % pkginfo.name) 264 bb.debug(2, "Writing package history for package %s" % pkginfo.name)
@@ -528,3 +522,55 @@ python buildhistory_eventhandler() {
528} 522}
529 523
530addhandler buildhistory_eventhandler 524addhandler buildhistory_eventhandler
525
526
527# FIXME this ought to be moved into the fetcher
528def _get_srcrev_values(d):
529 """
530 Return the version strings for the current recipe
531 """
532
533 scms = []
534 fetcher = bb.fetch.Fetch(d.getVar('SRC_URI', True).split(), d)
535 urldata = fetcher.ud
536 for u in urldata:
537 if urldata[u].method.supports_srcrev():
538 scms.append(u)
539
540 autoinc_templ = 'AUTOINC+'
541 dict = {}
542 for scm in scms:
543 ud = urldata[scm]
544 for name in ud.names:
545 rev = ud.method.sortable_revision(scm, ud, d, name)
546 if rev.startswith(autoinc_templ):
547 rev = rev[len(autoinc_templ):]
548 dict[name] = rev
549 return dict
550
551python do_write_srcrev() {
552 pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE', True)
553 srcrevfile = os.path.join(pkghistdir, 'latest_srcrev')
554
555 srcrevs = _get_srcrev_values(d)
556 if srcrevs:
557 if not os.path.exists(pkghistdir):
558 os.makedirs(pkghistdir)
559 with open(srcrevfile, 'w') as f:
560 orig_srcrev = d.getVar('SRCREV', False) or 'INVALID'
561 if orig_srcrev != 'INVALID':
562 f.write('# SRCREV = "%s"\n' % orig_srcrev)
563 if len(srcrevs) > 1:
564 for name, srcrev in srcrevs.items():
565 orig_srcrev = d.getVar('SRCREV_%s' % name, False)
566 if orig_srcrev:
567 f.write('# SRCREV_%s = "%s"\n' % (name, orig_srcrev))
568 f.write('SRCREV_%s = "%s"\n' % (name, srcrev))
569 else:
570 f.write('SRCREV = "%s"\n' % srcrevs.itervalues().next())
571 else:
572 if os.path.exists(srcrevfile):
573 os.remove(srcrevfile)
574}
575
576addtask write_srcrev after do_fetch before do_build