diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-03-26 18:59:01 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-03-26 19:27:19 +0000 |
| commit | 45e39e81698df91251c7fac5a642e211e98d834b (patch) | |
| tree | f4d2fa2774dd29f302617002bd8da417928a1408 /morphlib/plugins/cross-bootstrap_plugin.py | |
| parent | 9404317020ff0455cbfd3ca7976d546af823759b (diff) | |
| download | morph-baserock/pedroalvarez/defv8-submodules-squashed.tar.gz | |
Add support for definitions version 8baserock/pedroalvarez/defv8-submodules-squashed
This code is a rework from changes done by:
- Tiago Gomes <tiago.gomes@codethink.co.uk>
https://storyboard.baserock.org/#!/story/86
Change-Id: I3475c2bcb648a272fee33bc878a521f79d4e6581
Diffstat (limited to 'morphlib/plugins/cross-bootstrap_plugin.py')
| -rw-r--r-- | morphlib/plugins/cross-bootstrap_plugin.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/morphlib/plugins/cross-bootstrap_plugin.py b/morphlib/plugins/cross-bootstrap_plugin.py index c6ab8017..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) + system_artifact.source, build_command.repo_cache, 1, False, + definitions_version) builder.build_and_cache() self.app.status( |