From 2f4f8ef0fc5f2ff024e21903520a2680b0524721 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 19 Jan 2012 10:32:09 +0000 Subject: buildhistory: record additional image info Record some additional information about images - the uncompressed size of the final image as well as the values of various variables that may have influenced its contents. This is recorded in a machine-readable "image-info.txt" file similar in structure to the package history files. Also add some code to analyse changes to these values. (Most of the variable values aren't monitored directly but will be used as contextual information when they change at the same time as the content of the image changing.) (From OE-Core rev: 459ed6759a307b389f6ec1874136ec9aa0749120) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/buildhistory_analysis.py | 51 ++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 22 deletions(-) (limited to 'meta/lib/oe') diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index 9f42fe38ac..d3c0448fd1 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py @@ -15,16 +15,15 @@ import git # How to display fields -pkg_list_fields = ['DEPENDS', 'RDEPENDS', 'RRECOMMENDS', 'PACKAGES', 'FILES', 'FILELIST'] -pkg_numeric_fields = ['PKGSIZE'] +list_fields = ['DEPENDS', 'RDEPENDS', 'RRECOMMENDS', 'PACKAGES', 'FILES', 'FILELIST', 'USER_CLASSES', 'IMAGE_CLASSES', 'IMAGE_FEATURES', 'IMAGE_LINGUAS', 'IMAGE_INSTALL', 'BAD_RECOMMENDATIONS'] +numeric_fields = ['PKGSIZE', 'IMAGESIZE'] # Fields to monitor -pkg_monitor_fields = ['RDEPENDS', 'RRECOMMENDS', 'PACKAGES', 'FILELIST', 'PKGSIZE'] +monitor_fields = ['RDEPENDS', 'RRECOMMENDS', 'PACKAGES', 'FILELIST', 'PKGSIZE', 'IMAGESIZE'] # Percentage change to alert for numeric fields -pkg_monitor_numeric_threshold = 20 -# Image files to monitor +monitor_numeric_threshold = 20 +# Image files to monitor (note that image-info.txt is handled separately) img_monitor_files = ['installed-package-names.txt', 'files-in-image.txt'] - class ChangeRecord: def __init__(self, path, fieldname, oldvalue, newvalue): self.path = path @@ -34,13 +33,13 @@ class ChangeRecord: self.filechanges = None def __str__(self): - if self.fieldname in pkg_list_fields: + if self.fieldname in list_fields: aitems = self.oldvalue.split(' ') bitems = self.newvalue.split(' ') removed = list(set(aitems) - set(bitems)) added = list(set(bitems) - set(aitems)) return '%s: %s:%s%s' % (self.path, self.fieldname, ' removed "%s"' % ' '.join(removed) if removed else '', ' added "%s"' % ' '.join(added) if added else '') - elif self.fieldname in pkg_numeric_fields: + elif self.fieldname in numeric_fields: aval = int(self.oldvalue) bval = int(self.newvalue) percentchg = ((bval - aval) / float(aval)) * 100 @@ -190,6 +189,25 @@ def compare_lists(alines, blines): return filechanges +def compare_dict_blobs(path, ablob, bblob, report_all): + adict = blob_to_dict(ablob) + bdict = blob_to_dict(bblob) + + changes = [] + for key in adict: + if report_all or key in monitor_fields: + if adict[key] != bdict[key]: + if (not report_all) and key in numeric_fields: + aval = int(adict[key]) + bval = int(bdict[key]) + percentchg = ((bval - aval) / float(aval)) * 100 + if percentchg < monitor_numeric_threshold: + continue + chg = ChangeRecord(path, key, adict[key], bdict[key]) + changes.append(chg) + return changes + + def process_changes(repopath, revision1, revision2 = 'HEAD', report_all = False): repo = git.Repo(repopath) assert repo.bare == False @@ -200,20 +218,7 @@ def process_changes(repopath, revision1, revision2 = 'HEAD', report_all = False) for d in diff.iter_change_type('M'): path = os.path.dirname(d.a_blob.path) if path.startswith('packages/'): - adict = blob_to_dict(d.a_blob) - bdict = blob_to_dict(d.b_blob) - - for key in adict: - if report_all or key in pkg_monitor_fields: - if adict[key] != bdict[key]: - if (not report_all) and key in pkg_numeric_fields: - aval = int(adict[key]) - bval = int(bdict[key]) - percentchg = ((bval - aval) / float(aval)) * 100 - if percentchg < pkg_monitor_numeric_threshold: - continue - chg = ChangeRecord(path, key, adict[key], bdict[key]) - changes.append(chg) + changes.extend(compare_dict_blobs(path, d.a_blob, d.b_blob, report_all)) elif path.startswith('images/'): filename = os.path.basename(d.a_blob.path) if filename in img_monitor_files: @@ -236,5 +241,7 @@ def process_changes(repopath, revision1, revision2 = 'HEAD', report_all = False) else: chg = ChangeRecord(path, filename, d.a_blob.data_stream.read(), d.b_blob.data_stream.read()) changes.append(chg) + elif filename == 'image-info.txt': + changes.extend(compare_dict_blobs(path, d.a_blob, d.b_blob, report_all)) return changes -- cgit v1.2.3-54-g00ecf