Clean up now that submodules are properly supported. (#4053)

3 files changed, 3 insertions, 21 deletions

diff --git a/var/spack/repos/builtin/packages/flecsale/package.py b/var/spack/repos/builtin/packages/flecsale/package.py
index 42820cfd96..0276da3db2 100644
--- a/var/spack/repos/builtin/packages/flecsale/package.py
+++ b/var/spack/repos/builtin/packages/flecsale/package.py
@@ -31,7 +31,7 @@ class Flecsale(CMakePackage):
     homepage = "https://github.com/laristra/flecsale"
     url      = "https://github.com/laristra/flecsale/tarball/v1.0"
 
-    version('develop', git='https://github.com/laristra/flecsale', branch='master', submodules=False)
+    version('develop', git='https://github.com/laristra/flecsale', branch='master', submodules=True)
 
     variant('debug', default=False, description='Build debug version')
     variant('mpi', default=True,
@@ -43,12 +43,6 @@ class Flecsale(CMakePackage):
     depends_on("python@2:2.8")
     depends_on("openssl")
 
-    # drop when #3958 has been merged
-    def do_fetch(self, mirror_only=True):
-        super(Flecsale, self).do_fetch(mirror_only)
-        git = which("git")
-        git('submodule', 'update', '--init', '--recursive')
-
     def build_type(self):
         spec = self.spec
         if '+debug' in spec:
diff --git a/var/spack/repos/builtin/packages/flecsi/package.py b/var/spack/repos/builtin/packages/flecsi/package.py
index 947719508c..24c3e6b4d7 100644
--- a/var/spack/repos/builtin/packages/flecsi/package.py
+++ b/var/spack/repos/builtin/packages/flecsi/package.py
@@ -39,7 +39,7 @@ class Flecsi(CMakePackage):
     homepage = "http://flecsi.lanl.gov/"
     url      = "https://github.com/laristra/flecsi/tarball/v1.0"
 
-    version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=False)
+    version('develop', git='https://github.com/laristra/flecsi', branch='master', submodules=True)
 
     variant('debug', default=False, description='Build debug version')
     variant('mpi', default=True,
@@ -49,12 +49,6 @@ class Flecsi(CMakePackage):
     depends_on("legion+shared", when='~mpi')
     depends_on("legion+shared+mpi", when='+mpi')
 
-    # drop when #3958 has been merged
-    def do_fetch(self, mirror_only=True):
-        super(Flecsi, self).do_fetch(mirror_only)
-        git = which("git")
-        git('-C', 'flecsi', 'submodule', 'update', '--init', '--recursive')
-
     def build_type(self):
         spec = self.spec
         if '+debug' in spec:
diff --git a/var/spack/repos/builtin/packages/portage/package.py b/var/spack/repos/builtin/packages/portage/package.py
index 2bbc54b6cb..51166b97a3 100644
--- a/var/spack/repos/builtin/packages/portage/package.py
+++ b/var/spack/repos/builtin/packages/portage/package.py
@@ -34,7 +34,7 @@ class Portage(CMakePackage):
     homepage = "http://portage.lanl.gov/"
     url      = "https://github.com/laristra/portage/tarball/v1.0"
 
-    version('develop', git='https://github.com/laristra/portage', branch='master', submodules=False)
+    version('develop', git='https://github.com/laristra/portage', branch='master', submodules=True)
 
     variant('debug', default=False, description='Build debug version')
     variant('mpi', default=True, description='Support MPI')
@@ -42,12 +42,6 @@ class Portage(CMakePackage):
     depends_on("cmake@3.1:", type='build')
     depends_on('mpi', when='+mpi')
 
-    # drop when #3958 has been merged
-    def do_fetch(self, mirror_only=True):
-        super(Portage, self).do_fetch(mirror_only)
-        git = which("git")
-        git('submodule', 'update', '--init', '--recursive')
-
     def build_type(self):
         spec = self.spec
         if '+debug' in spec: