Don't remembers what thoses do, but don't want to loose them either.

bootstrap/docker/ubuntu-18/Dockerfile.bash

@@ -1,5 +1,5 @@
 
-FROM ununtu18.coriolis
+FROM ubuntu18.coriolis
 
 COPY root/dot.bashrc  /root/.bashrc
 

bootstrap/docker/ubuntu-18/Dockerfile.coriolis

@@ -6,5 +6,5 @@ RUN  mkdir -p coriolis-2.x/src                       \
  &&  git clone https://github.com/m-labs/nmigen.git  \
  &&  cd nmigen                                       \
  &&  python3 setup.py develop                        \
- &&  /root/socInstaller.py --docker --profile=Ubuntu18 --do-alliance --do-coriolis --benchs
+ &&  /root/socInstaller.py --docker --profile=Ubuntu18 --do-alliance --do-coriolis
 

bootstrap/docker/ubuntu-18/root/socInstaller.py

@@ -203,6 +203,13 @@ class CommandArg ( object ):
         return
 
 
+class YosysCommand ( CommandArg ):
+
+    def __init__ ( self, yosysBin, fdLog=None ):
+        CommandArg.__init__ ( self, [ yosysBin ], fdLog=fdLog )
+        return
+
+
 class AllianceCommand ( CommandArg ):
 
     def __init__ ( self, alcBin, fdLog=None ):
@@ -286,7 +293,7 @@ class Configuration ( object ):
         , 'success'     , 'rcode'
         ]
     SecondaryNames = \
-        [ 'rootDir', 'srcDir', 'logDir', 'logs', 'fds', 'alcBin', 'ccbBin', 'benchsDir'
+        [ 'rootDir', 'srcDir', 'logDir', 'logs', 'fds', 'yosysBin', 'alcBin', 'ccbBin', 'benchsDir'
         ]
 
     def __init__ ( self ):
@@ -301,8 +308,9 @@ class Configuration ( object ):
         self._rmSource     = False
         self._rmBuild      = False
         self._doGit        = True
-        self._doCoriolis   = False
+        self._doYosys      = False
         self._doAlliance   = False
+        self._doCoriolis   = False
         self._doBenchs     = False
         self._doSendReport = False
         self._nightlyMode  = False
@@ -355,6 +363,7 @@ class Configuration ( object ):
           self._rootDir  = self._homeDir + '/coriolis-2.x'
         self._srcDir     = self._rootDir + '/src'
         self._logDir     = self._srcDir  + '/logs'
+        self._yosysBin   = self._srcDir  + '/' + GitRepository.getLocalRepository(self._coriolisRepo) + '/bootstrap/yosysInstaller.sh'
         self._alcBin     = self._srcDir  + '/' + GitRepository.getLocalRepository(self._coriolisRepo) + '/bootstrap/allianceInstaller.sh'
         self._ccbBin     = self._srcDir  + '/' + GitRepository.getLocalRepository(self._coriolisRepo) + '/bootstrap/ccb.py'
         self._benchsDir  = self._srcDir  + '/' + GitRepository.getLocalRepository(self._benchsRepo  ) + '/benchs'
@@ -415,6 +424,13 @@ class Configuration ( object ):
     def getCommands ( self, target ):
         commands  = []
 
+        if self.doYosys:
+          if not os.path.isfile( self.yosysBin ):
+            raise ErrorMessage( 1, [ 'Cannot find <yosysInstaller.sh>, should be here:'
+                                   , '   <%s>' % self.yosysBin
+                                   ] )
+          commands.append( YosysCommand( self.yosysBin, fdLog=self.fds['yosys'] ) )
+
         if self.doAlliance:
           if not os.path.isfile( self.alcBin ):
             raise ErrorMessage( 1, [ 'Cannot find <allianceInstaller.sh>, should be here:'
@@ -440,7 +456,7 @@ class Configuration ( object ):
             otherArgs.append( '--devtoolset=8' )
             commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 6, otherArgs          , fdLog=self.fds['coriolis'] ) )
             commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 1, otherArgs+['--doc'], fdLog=self.fds['coriolis'] ) )
-          elif target == 'Ubuntu18' or target == 'Debian9':
+          elif target == 'Ubuntu18' or target == 'Debian9' or target == 'Debian10':
             if target == 'Ubuntu18': otherArgs.append( '--qt5' )
             commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) )
 
@@ -524,6 +540,7 @@ class Report ( object ):
 parser = optparse.OptionParser ()  
 parser.add_option ( "--debug"       , action="store_true" ,                dest="debug"        , help="Build a <Debug> aka (-g) version." )
 parser.add_option ( "--no-git"      , action="store_true" ,                dest="noGit"        , help="Do not pull/update Git repositories before building." )
+parser.add_option ( "--do-yosys"    , action="store_true" ,                dest="doYosys"      , help="Rebuild Yosys." )
 parser.add_option ( "--do-alliance" , action="store_true" ,                dest="doAlliance"   , help="Rebuild the Alliance tools." )
 parser.add_option ( "--do-coriolis" , action="store_true" ,                dest="doCoriolis"   , help="Rebuild the Coriolis tools." )
 parser.add_option ( "--do-report"   , action="store_true" ,                dest="doReport"     , help="Send a final report." )
@@ -547,14 +564,16 @@ try:
     if options.docker:                    conf.dockerMode   = True
     if options.chroot:                    conf.chrootMode   = True
     if options.noGit:                     conf.doGit        = False
-    if options.doCoriolis:                conf.doCoriolis   = True
+    if options.doYosys:                   conf.doYosys      = True
     if options.doAlliance:                conf.doAlliance   = True
+    if options.doCoriolis:                conf.doCoriolis   = True
     if options.benchs:                    conf.doBenchs     = True
     if options.doReport:                  conf.doSendReport = True
     if options.rmSource or options.rmAll: conf.rmSource     = True
     if options.rmBuild  or options.rmAll: conf.rmBuild      = True
 
 
+    if conf.doYosys:    conf.openLog( 'yosys'    )
     if conf.doAlliance: conf.openLog( 'alliance' )
     if conf.doCoriolis: conf.openLog( 'coriolis' )
     if conf.doBenchs:   conf.openLog( 'benchs'   )
@@ -577,16 +596,16 @@ try:
            #if gitSupport.url.endswith('rapidjson'):
            #  gitSupport.checkout( 'a1c4f32' )
         
-      if conf.doCoriolis:
-        if conf.rmSource: gitCoriolis.removeLocalRepo()
-        gitCoriolis.clone   ()
-        gitCoriolis.checkout( 'devel' )
-
             if conf.doAlliance:
                 if conf.rmSource: gitAlliance.removeLocalRepo()
                 gitAlliance.clone   ()
                #gitAlliance.checkout( 'devel' )
             
+            if conf.doCoriolis:
+                if conf.rmSource: gitCoriolis.removeLocalRepo()
+                gitCoriolis.clone   ()
+                gitCoriolis.checkout( 'devel' )
+      
         if conf.rmSource: gitBenchs.removeLocalRepo()
         gitBenchs.clone()