diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-05 09:56:03 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-05 09:57:44 +0000 |
| commit | f3197d814a5e883f47631a4f0acfa51bd1285daf (patch) | |
| tree | b1353461cfa944c62a7bfbbc8fb51664581bfe27 /morphlib/plugins | |
| parent | a4f5d580dfe9b1715e24dd1b49dde4f1d240b880 (diff) | |
| parent | fb7eb661b2b02bf049d24fa4a232f303b5058b1b (diff) | |
| download | morph-f3197d814a5e883f47631a4f0acfa51bd1285daf.tar.gz | |
Merge remote-tracking branch 'origin/sam/rename-builder2'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Richard Ipsum <richard.ipsum@codethink.co.uk>
Diffstat (limited to 'morphlib/plugins')
| -rw-r--r-- | morphlib/plugins/cross-bootstrap_plugin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/cross-bootstrap_plugin.py b/morphlib/plugins/cross-bootstrap_plugin.py index 7b53a4a5..2b5c8911 100644 --- a/morphlib/plugins/cross-bootstrap_plugin.py +++ b/morphlib/plugins/cross-bootstrap_plugin.py @@ -46,7 +46,7 @@ def escape_source_name(source): # Most of this is ripped from RootfsTarballBuilder, and should be reconciled # with it. -class BootstrapSystemBuilder(morphlib.builder2.BuilderBase): +class BootstrapSystemBuilder(morphlib.builder.BuilderBase): '''Build a bootstrap system tarball The bootstrap system image contains a minimal cross-compiled toolchain @@ -104,7 +104,7 @@ class BootstrapSystemBuilder(morphlib.builder2.BuilderBase): source_dir = os.path.join(path, 'src', escaped_source) if not os.path.exists(source_dir): os.makedirs(source_dir) - morphlib.builder2.extract_sources( + morphlib.builder.extract_sources( self.app, self.repo_cache, s.repo, s.sha1, source_dir) name = s.name |