summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUmashankar Sivakumar <Umashankar.Sivakumar@amd.com>2022-11-27 17:35:49 +0530
committerGitHub <noreply@github.com>2022-11-27 13:05:49 +0100
commit46a0cd8e5525aee69c7b8e9073b118c15edf40e8 (patch)
tree13f6d145c5367eadd95925299491706885ec41c7
parentb2ceb231652848627cae8e2a2fdbe8846d3d1ca7 (diff)
downloadspack-46a0cd8e5525aee69c7b8e9073b118c15edf40e8.tar.gz
spack-46a0cd8e5525aee69c7b8e9073b118c15edf40e8.tar.bz2
spack-46a0cd8e5525aee69c7b8e9073b118c15edf40e8.tar.xz
spack-46a0cd8e5525aee69c7b8e9073b118c15edf40e8.zip
SingularityCE: Add conmon+squashfs as dependencies (#33891)
-rw-r--r--var/spack/repos/builtin/packages/singularityce/package.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/singularityce/package.py b/var/spack/repos/builtin/packages/singularityce/package.py
index 0ee15ae5a9..baf707bf2b 100644
--- a/var/spack/repos/builtin/packages/singularityce/package.py
+++ b/var/spack/repos/builtin/packages/singularityce/package.py
@@ -16,6 +16,8 @@ class SingularityBase(MakefilePackage):
variant("network", default=True, description="install network plugins")
depends_on("pkgconfig", type="build")
+ depends_on("conmon", type=("build", "run"))
+ depends_on("squashfs", type=("build", "run"))
depends_on("go@1.16:")
depends_on("uuid")
depends_on("libgpg-error")
@@ -72,6 +74,8 @@ class SingularityBase(MakefilePackage):
def edit(self, spec, prefix):
with working_dir(self.build_directory):
confstring = "./mconfig --prefix=%s" % prefix
+ # Using conmon from spack
+ confstring += " --without-conmon"
if "~suid" in spec:
confstring += " --without-suid"
if "~network" in spec: