summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-05-07 17:11:42 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-05-08 09:29:07 +0000
commit90f820db7e7e4b9b37cf00f001ac638b3e30ea80 (patch)
tree4acc048d0ea7f39a58e9df291b26dd2c4f9f7a19
parentb8d3fd29bfe34ae58d2e750408d3b4178a489931 (diff)
downloadmorph-90f820db7e7e4b9b37cf00f001ac638b3e30ea80.tar.gz
Fix crossbootstrap plugin for checksum changes to builder.py
-rw-r--r--morphlib/plugins/cross-bootstrap_plugin.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/morphlib/plugins/cross-bootstrap_plugin.py b/morphlib/plugins/cross-bootstrap_plugin.py
index ec0cfbcb..aea32ccd 100644
--- a/morphlib/plugins/cross-bootstrap_plugin.py
+++ b/morphlib/plugins/cross-bootstrap_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Codethink Limited
+# Copyright (C) 2013-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -75,7 +75,7 @@ class BootstrapSystemBuilder(morphlib.builder2.BuilderBase):
handle.close()
- self.save_build_times()
+ self.save_build_info()
return [self.artifact]
def unpack_binary_chunks(self, dest):
@@ -195,6 +195,8 @@ class BootstrapSystemBuilder(morphlib.builder2.BuilderBase):
f.write('rm -Rf $DESTDIR/$chunk_name.build')
def create_tarball(self, handle, fs_root, system_name):
+ # FIXME: duplicates morphlib.bins.create_system(), but uses gzopen()
+ # instead of open() ...
unslashy_root = fs_root[1:]
def uproot_info(info):
info.name = os.path.relpath(info.name, unslashy_root)