Morph build 11ac5b237b3640718da94ad8e252d330

System branch: master

1 files changed, 35 insertions, 22 deletions

diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py
index 8c2781aa..768ec643 100644
--- a/morphlib/stagingarea.py
+++ b/morphlib/stagingarea.py
@@ -87,6 +87,14 @@ class StagingArea(object):
 
         return self._dir_for_source(source, 'inst')
 
+    def overlay_upperdir(self, source):
+        '''Create a directory to be upperdir for overlayfs, and return it.'''
+        return self._dir_for_source(source, 'overlay_upper')
+
+    def overlaydir(self, source):
+        '''Create a directory to be a mount point for overlayfs, return it'''
+        return self._dir_for_source(source, 'overlay')
+
     def relative(self, filename):
         '''Return a filename relative to the staging area.'''
 
@@ -146,37 +154,42 @@ class StagingArea(object):
             raise IOError('Cannot extract %s into staging-area. Unsupported'
                           ' type.' % srcpath)
 
-    def install_artifact(self, handle):
+    def create_devices(self, morphology): # pragma: no cover
+        '''Creates device nodes if the morphology specifies them'''
+        perms_mask = stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO
+        if 'devices' in morphology and morphology['devices'] is not None:
+            for dev in morphology['devices']:
+                destfile = os.path.join(self.dirname, './' + dev['filename'])
+                mode = int(dev['permissions'], 8) & perms_mask
+                if dev['type'] == 'c':
+                    mode = mode | stat.S_IFCHR
+                elif dev['type'] == 'b':
+                    mode = mode | stat.S_IFBLK
+                else:
+                    raise IOError('Cannot create device node %s,'
+                                  'unrecognized device type "%s"'
+                                  % (destfile, dev['type']))
+                parent = os.path.dirname(destfile)
+                if not os.path.exists(parent):
+                    os.makedirs(parent)
+                if not os.path.exists(destfile):
+                    logging.debug("Creating device node %s" % destfile)
+                    os.mknod(destfile, mode,
+                             os.makedev(dev['major'], dev['minor']))
+                    os.chown(destfile, dev['uid'], dev['gid'])
+
+    def install_artifact(self, artifact, artifact_checkout):
         '''Install a build artifact into the staging area.
 
         We access the artifact via an open file handle. For now, we assume
         the artifact is a tarball.
 
         '''
-
-        chunk_cache_dir = os.path.join(self._app.settings['tempdir'], 'chunks')
-        unpacked_artifact = os.path.join(
-            chunk_cache_dir, os.path.basename(handle.name) + '.d')
-        if not os.path.exists(unpacked_artifact):
-            self._app.status(
-                msg='Unpacking chunk from cache %(filename)s',
-                filename=os.path.basename(handle.name))
-            savedir = tempfile.mkdtemp(dir=chunk_cache_dir)
-            try:
-                morphlib.bins.unpack_binary_from_file(
-                    handle, savedir + '/')
-            except BaseException as e: # pragma: no cover
-                shutil.rmtree(savedir)
-                raise
-            # TODO: This rename is not concurrency safe if two builds are
-            #       extracting the same chunk, one build will fail because
-            #       the other renamed its tempdir here first.
-            os.rename(savedir, unpacked_artifact)
-
         if not os.path.exists(self.dirname):
             self._mkdir(self.dirname)
 
-        self.hardlink_all_files(unpacked_artifact, self.dirname)
+        self.hardlink_all_files(artifact_checkout, self.dirname)
+        self.create_devices(artifact.source.morphology)
 
     def remove(self):
         '''Remove the entire staging area.