diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-01-28 14:57:39 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-13 15:20:02 +0000 |
| commit | b7f69986034afef8a792839fac601caa0f20d55a (patch) | |
| tree | 1ff1f9b9b02ee0e68f54ab91dbf6203cc31ebd8c /morphlib/buildcommand.py | |
| parent | 79a6f05bbf70a4fa10b1b426ef9f223d5cbaf3ee (diff) | |
| download | morph-b7f69986034afef8a792839fac601caa0f20d55a.tar.gz | |
Remove features used by old bootstrap method
That means that bootstrapping Baserock is currently not possible with
this branch of Morph, but there's no reason it cannot be bootstrapped
using an older version of Morph instead.
Diffstat (limited to 'morphlib/buildcommand.py')
| -rw-r--r-- | morphlib/buildcommand.py | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index dfacd760..4200dc0e 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -219,18 +219,14 @@ class BuildCommand(object): deps = self.get_recursive_deps(artifact) self.cache_artifacts_locally(deps) staging_area = self.create_staging_area(artifact) - if self.app.settings['staging-chroot']: - if artifact.source.morphology.needs_staging_area: - self.install_fillers(staging_area) - self.install_chunk_artifacts(staging_area, - deps, artifact) - morphlib.builder2.ldconfig(self.app.runcmd, - staging_area.tempdir) + if artifact.source.morphology.needs_staging_area: + self.install_fillers(staging_area) + self.install_chunk_artifacts(staging_area, + deps, artifact) + morphlib.builder2.ldconfig(self.app.runcmd, + staging_area.tempdir) self.build_and_cache(staging_area, artifact) - if self.app.settings['bootstrap']: - self.install_chunk_artifacts(staging_area, - (artifact,)) self.remove_staging_area(staging_area) self.app.status(msg='%(kind)s %(name)s is cached at %(cachepath)s', kind=artifact.source.morphology['kind'], @@ -319,12 +315,8 @@ class BuildCommand(object): def create_staging_area(self, artifact): '''Create the staging area for building a single artifact.''' - if self.app.settings['staging-chroot']: - staging_root = tempfile.mkdtemp(dir=self.app.settings['tempdir']) - staging_temp = staging_root - else: - staging_root = '/' - staging_temp = tempfile.mkdtemp(dir=self.app.settings['tempdir']) + staging_root = tempfile.mkdtemp(dir=self.app.settings['tempdir']) + staging_temp = staging_root self.app.status(msg='Creating staging area') staging_area = morphlib.stagingarea.StagingArea(self.app, @@ -387,5 +379,5 @@ class BuildCommand(object): setup_mounts = self.app.settings['staging-chroot'] builder = morphlib.builder2.Builder( self.app, staging_area, self.lac, self.rac, self.lrc, - self.build_env, self.app.settings['max-jobs'], setup_mounts) + self.build_env, self.app.settings['max-jobs'], True) return builder.build_and_cache(artifact) |