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 | |
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')
-rw-r--r-- | morphlib/__init__.py | 2 | ||||
-rw-r--r-- | morphlib/buildcommand.py | 6 | ||||
-rw-r--r-- | morphlib/builder.py (renamed from morphlib/builder2.py) | 0 | ||||
-rw-r--r-- | morphlib/builder_tests.py (renamed from morphlib/builder2_tests.py) | 8 | ||||
-rw-r--r-- | morphlib/plugins/cross-bootstrap_plugin.py | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/morphlib/__init__.py b/morphlib/__init__.py index 8319430c..0d445304 100644 --- a/morphlib/__init__.py +++ b/morphlib/__init__.py @@ -56,7 +56,7 @@ import buildbranch import buildcommand import buildenvironment import buildsystem -import builder2 +import builder import cachedrepo import cachekeycomputer import extensions diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 527163f6..5c7d5c5e 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2014 Codethink Limited +# Copyright (C) 2011-2015 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 @@ -528,7 +528,7 @@ class BuildCommand(object): staging_area.install_artifact(handle) if target_source.build_mode == 'staging': - morphlib.builder2.ldconfig(self.app.runcmd, staging_area.dirname) + morphlib.builder.ldconfig(self.app.runcmd, staging_area.dirname) def build_and_cache(self, staging_area, source, setup_mounts): '''Build a source and put its artifacts into the local cache.''' @@ -536,7 +536,7 @@ class BuildCommand(object): self.app.status(msg='Starting actual build: %(name)s ' '%(sha1)s', name=source.name, sha1=source.sha1[:7]) - builder = morphlib.builder2.Builder( + builder = morphlib.builder.Builder( self.app, staging_area, self.lac, self.rac, self.lrc, self.app.settings['max-jobs'], setup_mounts) return builder.build_and_cache(source) diff --git a/morphlib/builder2.py b/morphlib/builder.py index 9e158ea1..9e158ea1 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder.py diff --git a/morphlib/builder2_tests.py b/morphlib/builder_tests.py index 4fd0807a..2087c942 100644 --- a/morphlib/builder2_tests.py +++ b/morphlib/builder_tests.py @@ -154,7 +154,7 @@ class BuilderBaseTests(unittest.TestCase): self.repo_cache = None self.build_env = FakeBuildEnv() self.max_jobs = 1 - self.builder = morphlib.builder2.BuilderBase(self.app, + self.builder = morphlib.builder.BuilderBase(self.app, self.staging_area, self.artifact_cache, None, @@ -193,7 +193,7 @@ class BuilderBaseTests(unittest.TestCase): fh = rac.put(a) fh.write(a.name) fh.close() - morphlib.builder2.download_depends(afacts, lac, rac) + morphlib.builder.download_depends(afacts, lac, rac) self.assertTrue(all(lac.has(a) for a in afacts)) def test_downloads_depends_metadata(self): @@ -207,7 +207,7 @@ class BuilderBaseTests(unittest.TestCase): fh = rac.put_artifact_metadata(a, 'meta') fh.write('metadata') fh.close() - morphlib.builder2.download_depends(afacts, lac, rac, ('meta',)) + morphlib.builder.download_depends(afacts, lac, rac, ('meta',)) self.assertTrue(all(lac.has(a) for a in afacts)) self.assertTrue(all(lac.has_artifact_metadata(a, 'meta') for a in afacts)) @@ -217,5 +217,5 @@ class ChunkBuilderTests(unittest.TestCase): def setUp(self): self.app = FakeApp() - self.build = morphlib.builder2.ChunkBuilder(self.app, None, None, + self.build = morphlib.builder.ChunkBuilder(self.app, None, None, None, None, None, 1, False) 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 |