Yocto 2.3
Move OpenBMC to Yocto 2.3(pyro).
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Resolves: openbmc/openbmc#2461
diff --git a/import-layers/yocto-poky/scripts/buildstats-diff b/import-layers/yocto-poky/scripts/buildstats-diff
index f918a6d..adeba44 100755
--- a/import-layers/yocto-poky/scripts/buildstats-diff
+++ b/import-layers/yocto-poky/scripts/buildstats-diff
@@ -22,7 +22,6 @@
import re
import sys
from collections import namedtuple
-from datetime import datetime, timedelta, tzinfo
from operator import attrgetter
# Setup logging
@@ -35,38 +34,11 @@
pass
-class TimeZone(tzinfo):
- """Simple fixed-offset tzinfo"""
- def __init__(self, seconds, name):
- self._offset = timedelta(seconds=seconds)
- self._name = name
-
- def utcoffset(self, dt):
- return self._offset
-
- def tzname(self, dt):
- return self._name
-
- def dst(self, dt):
- return None
-
-TIMEZONES = {'UTC': TimeZone(0, 'UTC'),
- 'EET': TimeZone(7200, 'EET'),
- 'EEST': TimeZone(10800, 'EEST')}
-
taskdiff_fields = ('pkg', 'pkg_op', 'task', 'task_op', 'value1', 'value2',
'absdiff', 'reldiff')
TaskDiff = namedtuple('TaskDiff', ' '.join(taskdiff_fields))
-def to_datetime_obj(obj):
- """Helper for getting timestamps in datetime format"""
- if isinstance(obj, datetime):
- return obj
- else:
- return datetime.utcfromtimestamp(obj).replace(tzinfo=TIMEZONES['UTC'])
-
-
class BSTask(dict):
def __init__(self, *args, **kwargs):
self['start_time'] = None
@@ -86,7 +58,7 @@
@property
def walltime(self):
"""Elapsed wall clock time"""
- return self['elapsed_time'].total_seconds()
+ return self['elapsed_time']
@property
def read_bytes(self):
@@ -118,10 +90,10 @@
key, val = line.split(':', 1)
val = val.strip()
if key == 'Started':
- start_time = to_datetime_obj(float(val))
+ start_time = float(val)
bs_task['start_time'] = start_time
elif key == 'Ended':
- end_time = to_datetime_obj(float(val))
+ end_time = float(val)
elif key.startswith('IO '):
split = key.split()
bs_task['iostat'][split[1]] = int(val)
@@ -329,7 +301,7 @@
print("\nEPOCH CHANGED:")
print("--------------")
for pkg in sorted(echanged):
- field1 = "{} -> {}".format(pkg, bs1[pkg]['epoch'], bs2[pkg]['epoch'])
+ field1 = "{} -> {}".format(bs1[pkg]['epoch'], bs2[pkg]['epoch'])
field2 = "{} -> {}".format(bs1[pkg]['nevr'], bs2[pkg]['nevr'])
print(fmt_str.format(pkg, field1, field2, maxlen=maxlen))