diff options
author | Ross Burton <ross.burton@intel.com> | 2019-04-26 11:10:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-28 13:28:37 +0100 |
commit | adaba4ee4f0997a2827c3d73ed34081c82eb3b4d (patch) | |
tree | 71b576b76ffdb4a74fc005d1a4f8d4cf39fc4305 /meta | |
parent | d533ffb82c9585037a6bae6fd862d53222fecb0e (diff) | |
download | poky-adaba4ee4f0997a2827c3d73ed34081c82eb3b4d.tar.gz |
buildhistory: report sysroot changes
Now that the sysroot is written into the build history, write it out.
(From OE-Core rev: e9df98ba63e6d2baefee550170dbdd11ed2ad03a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/buildhistory_analysis.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index 62c7a2e58e..8af76c6b3a 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py | |||
@@ -181,7 +181,7 @@ class ChangeRecord: | |||
181 | diff = difflib.unified_diff(alines, blines, self.fieldname, self.fieldname, lineterm='') | 181 | diff = difflib.unified_diff(alines, blines, self.fieldname, self.fieldname, lineterm='') |
182 | out += '\n '.join(list(diff)[2:]) | 182 | out += '\n '.join(list(diff)[2:]) |
183 | out += '\n --' | 183 | out += '\n --' |
184 | elif self.fieldname in img_monitor_files or '/image-files/' in self.path: | 184 | elif self.fieldname in img_monitor_files or '/image-files/' in self.path or self.fieldname == "sysroot": |
185 | if self.filechanges or (self.oldvalue and self.newvalue): | 185 | if self.filechanges or (self.oldvalue and self.newvalue): |
186 | fieldname = self.fieldname | 186 | fieldname = self.fieldname |
187 | if '/image-files/' in self.path: | 187 | if '/image-files/' in self.path: |
@@ -571,6 +571,15 @@ def process_changes(repopath, revision1, revision2='HEAD', report_all=False, rep | |||
571 | elif filename.startswith('latest.'): | 571 | elif filename.startswith('latest.'): |
572 | chg = ChangeRecord(path, filename, d.a_blob.data_stream.read().decode('utf-8'), d.b_blob.data_stream.read().decode('utf-8'), True) | 572 | chg = ChangeRecord(path, filename, d.a_blob.data_stream.read().decode('utf-8'), d.b_blob.data_stream.read().decode('utf-8'), True) |
573 | changes.append(chg) | 573 | changes.append(chg) |
574 | elif filename == 'sysroot': | ||
575 | alines = d.a_blob.data_stream.read().decode('utf-8').splitlines() | ||
576 | blines = d.b_blob.data_stream.read().decode('utf-8').splitlines() | ||
577 | filechanges = compare_file_lists(alines,blines) | ||
578 | if filechanges: | ||
579 | chg = ChangeRecord(path, filename, None, None, True) | ||
580 | chg.filechanges = filechanges | ||
581 | changes.append(chg) | ||
582 | |||
574 | elif path.startswith('images/'): | 583 | elif path.startswith('images/'): |
575 | filename = os.path.basename(d.a_blob.path) | 584 | filename = os.path.basename(d.a_blob.path) |
576 | if filename in img_monitor_files: | 585 | if filename in img_monitor_files: |