From 46a0cd8e5525aee69c7b8e9073b118c15edf40e8 Mon Sep 17 00:00:00 2001 From: Umashankar Sivakumar Date: Sun, 27 Nov 2022 17:35:49 +0530 Subject: SingularityCE: Add conmon+squashfs as dependencies (#33891) --- var/spack/repos/builtin/packages/singularityce/package.py | 4 ++++ 1 file changed, 4 insertions(+) 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: -- cgit v1.2.3-60-g2f50