SingularityCE: Add conmon+squashfs as dependencies (#33891)

This commit is contained in:
Umashankar Sivakumar 2022-11-27 17:35:49 +05:30 committed by GitHub
parent b2ceb23165
commit 46a0cd8e55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -16,6 +16,8 @@ class SingularityBase(MakefilePackage):
variant("network", default=True, description="install network plugins") variant("network", default=True, description="install network plugins")
depends_on("pkgconfig", type="build") depends_on("pkgconfig", type="build")
depends_on("conmon", type=("build", "run"))
depends_on("squashfs", type=("build", "run"))
depends_on("go@1.16:") depends_on("go@1.16:")
depends_on("uuid") depends_on("uuid")
depends_on("libgpg-error") depends_on("libgpg-error")
@ -72,6 +74,8 @@ def build_directory(self):
def edit(self, spec, prefix): def edit(self, spec, prefix):
with working_dir(self.build_directory): with working_dir(self.build_directory):
confstring = "./mconfig --prefix=%s" % prefix confstring = "./mconfig --prefix=%s" % prefix
# Using conmon from spack
confstring += " --without-conmon"
if "~suid" in spec: if "~suid" in spec:
confstring += " --without-suid" confstring += " --without-suid"
if "~network" in spec: if "~network" in spec: