diff options
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 58 | ||||
| -rwxr-xr-x | scripts/buildhistory-collect-srcrevs | 104 |
2 files changed, 156 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): f.write("DEPENDS = %s\n" % rcpinfo.depends) f.write("PACKAGES = %s\n" % rcpinfo.packages) - if rcpinfo.srcrev: - srcrevfile = os.path.join(pkghistdir, "latest_srcrev") - with open(srcrevfile, "w") as f: - f.write(','.join([rcpinfo.bbfile, rcpinfo.src_uri, rcpinfo.srcrev, - rcpinfo.srcrev_autorev])) - def write_pkghistory(pkginfo, d): bb.debug(2, "Writing package history for package %s" % pkginfo.name) @@ -528,3 +522,55 @@ python buildhistory_eventhandler() { } addhandler buildhistory_eventhandler + + +# FIXME this ought to be moved into the fetcher +def _get_srcrev_values(d): + """ + Return the version strings for the current recipe + """ + + scms = [] + fetcher = bb.fetch.Fetch(d.getVar('SRC_URI', True).split(), d) + urldata = fetcher.ud + for u in urldata: + if urldata[u].method.supports_srcrev(): + scms.append(u) + + autoinc_templ = 'AUTOINC+' + dict = {} + for scm in scms: + ud = urldata[scm] + for name in ud.names: + rev = ud.method.sortable_revision(scm, ud, d, name) + if rev.startswith(autoinc_templ): + rev = rev[len(autoinc_templ):] + dict[name] = rev + return dict + +python do_write_srcrev() { + pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE', True) + srcrevfile = os.path.join(pkghistdir, 'latest_srcrev') + + srcrevs = _get_srcrev_values(d) + if srcrevs: + if not os.path.exists(pkghistdir): + os.makedirs(pkghistdir) + with open(srcrevfile, 'w') as f: + orig_srcrev = d.getVar('SRCREV', False) or 'INVALID' + if orig_srcrev != 'INVALID': + f.write('# SRCREV = "%s"\n' % orig_srcrev) + if len(srcrevs) > 1: + for name, srcrev in srcrevs.items(): + orig_srcrev = d.getVar('SRCREV_%s' % name, False) + if orig_srcrev: + f.write('# SRCREV_%s = "%s"\n' % (name, orig_srcrev)) + f.write('SRCREV_%s = "%s"\n' % (name, srcrev)) + else: + f.write('SRCREV = "%s"\n' % srcrevs.itervalues().next()) + else: + if os.path.exists(srcrevfile): + os.remove(srcrevfile) +} + +addtask write_srcrev after do_fetch before do_build diff --git a/scripts/buildhistory-collect-srcrevs b/scripts/buildhistory-collect-srcrevs new file mode 100755 index 0000000000..7f65c90376 --- /dev/null +++ b/scripts/buildhistory-collect-srcrevs @@ -0,0 +1,104 @@ +#!/usr/bin/env python +# +# Collects the recorded SRCREV values from buildhistory and reports on them +# +# Copyright 2013 Intel Corporation +# Authored-by: Paul Eggleton <paul.eggleton@intel.com> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +import os, sys +import optparse +import logging + +def logger_create(): + logger = logging.getLogger("buildhistory") + loggerhandler = logging.StreamHandler() + loggerhandler.setFormatter(logging.Formatter("%(levelname)s: %(message)s")) + logger.addHandler(loggerhandler) + logger.setLevel(logging.INFO) + return logger + +logger = logger_create() + +def main(): + parser = optparse.OptionParser( + usage = """ + %prog [options] <buildhistory-dir>""") + + parser.add_option("-a", "--report-all", + help = "Report all SRCREV values, not just ones where AUTOREV has been used", + action="store_true", dest="reportall") + parser.add_option("-f", "--forcevariable", + help = "Use forcevariable override for all output lines", + action="store_true", dest="forcevariable") + + options, args = parser.parse_args(sys.argv) + + if len(args) != 2: + parser.print_help() + sys.exit(1) + + buildhistory_dir = args[1] + if not os.path.exists(buildhistory_dir): + logger.error('specified buildhistory path %s could not be found' % buildhistory_dir) + sys.exit(1) + + if options.forcevariable: + forcevariable = '_forcevariable' + else: + forcevariable = '' + + lastdir = '' + for root, dirs, files in os.walk(buildhistory_dir): + if '.git' in dirs: + dirs.remove('.git') + for fn in files: + if fn == 'latest_srcrev': + curdir = os.path.basename(os.path.dirname(root)) + if lastdir != curdir: + print('# %s' % curdir) + lastdir = curdir + fullpath = os.path.join(root, fn) + pn = os.path.basename(root) + srcrev = None + orig_srcrev = None + orig_srcrevs = {} + srcrevs = {} + with open(fullpath) as f: + for line in f: + if '=' in line: + splitval = line.split('=') + value = splitval[1].strip('" \t\n\r') + if line.startswith('# SRCREV = '): + orig_srcrev = value + elif line.startswith('# SRCREV_'): + splitval = line.split('=') + name = splitval[0].split('_')[1].strip() + orig_srcrevs[name] = value + elif line.startswith('SRCREV ='): + srcrev = value + elif line.startswith('SRCREV_'): + name = splitval[0].split('_')[1].strip() + srcrevs[name] = value + if srcrev and (options.reportall or srcrev != orig_srcrev): + print('SRCREV_pn-%s%s = "%s"' % (pn, forcevariable, srcrev)) + for name, value in srcrevs.items(): + orig = orig_srcrevs.get(name, orig_srcrev) + if options.reportall or value != orig: + print('SRCREV_%s_pn-%s%s = "%s"' % (name, pn, forcevariable, value)) + + +if __name__ == "__main__": + main() |