diff options
Diffstat (limited to 'morphlib/plugins')
-rw-r--r-- | morphlib/plugins/build_plugin.py | 3 | ||||
-rw-r--r-- | morphlib/plugins/cross-bootstrap_plugin.py | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py index 0aab2d51..be6d9602 100644 --- a/morphlib/plugins/build_plugin.py +++ b/morphlib/plugins/build_plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 Codethink Limited +# Copyright (C) 2012-2016 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 @@ -226,6 +226,7 @@ class BuildPlugin(cliapp.Plugin): ''' bc = morphlib.buildcommand.BuildCommand(self.app) bc.validate_sources(source_pool) + bc.source_pool = source_pool root = bc.resolve_artifacts(source_pool) if not component_names: component_names = [root.source.name] 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( |