summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-03-25 19:53:28 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-03-25 21:02:34 +0000
commit890d3d310dd45377ec58ffc065013d59edd3aa1e (patch)
tree1f886c32240813f7a3da305cc669ced13c710de6
parentb72cc9a9ea7537125bcd813473ee52dc39712719 (diff)
downloadmorph-890d3d310dd45377ec58ffc065013d59edd3aa1e.tar.gz
Change-Id: I6b84dbaa588f3ad9c98a7735eb6878b186bc944b
-rw-r--r--morphlib/plugins/cross-bootstrap_plugin.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/morphlib/plugins/cross-bootstrap_plugin.py b/morphlib/plugins/cross-bootstrap_plugin.py
index 981f6ed6..daed260e 100644
--- a/morphlib/plugins/cross-bootstrap_plugin.py
+++ b/morphlib/plugins/cross-bootstrap_plugin.py
@@ -104,7 +104,8 @@ class BootstrapSystemBuilder(morphlib.builder.BuilderBase):
if not os.path.exists(source_dir):
os.makedirs(source_dir)
morphlib.builder.extract_sources(
- self.app, self.repo_cache, s.repo, s.sha1, source_dir)
+ self.app, self.definitions_version, self.repo_cache,
+ s.repo, s.sha1, source_dir, s)
name = s.name
chunk_script = os.path.join(path, 'src', 'build-%s' % name)
@@ -256,6 +257,8 @@ class CrossBootstrapPlugin(cliapp.Plugin):
srcpool = build_command.create_source_pool(
root_repo, ref, [morph_name])
+ definitions_version = srcpool.definitions_version
+
# FIXME: this is a quick fix in order to get it working for
# Baserock 13 release, it is not a reasonable fix
def validate(self, root_artifact):
@@ -302,7 +305,8 @@ class CrossBootstrapPlugin(cliapp.Plugin):
system_artifact.source, build_env, use_chroot=False)
builder = BootstrapSystemBuilder(
self.app, staging_area, build_command.lac, build_command.rac,
- system_artifact.source, build_command.repo_cache, 1, False, 8)
+ system_artifact.source, build_command.repo_cache, 1, False,
+ definitions_version)
builder.build_and_cache()
self.app.status(