From 2ad6bed77cd68a0040cab9c44ab8f7001b731d23 Mon Sep 17 00:00:00 2001 From: Owen Solberg Date: Sun, 8 Sep 2019 11:55:15 -0700 Subject: for fakeroot support, add "shadow" dependency (#12754) * adding checksum for singularity 3.4, adding dep for shadow * make v3.4 a TODO for now -- needs cryptsetup package first --- var/spack/repos/builtin/packages/singularity/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index a368d5bf9a..d7e3ada566 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -25,6 +25,9 @@ class Singularity(MakefilePackage): git = "https://github.com/sylabs/singularity.git" version('develop', branch='master') + # TODO: 3.4.0 requires cryptsetup (both build and run) which still needs + # packaging + # version('3.4.0', sha256='eafb27f1ffbed427922ebe2b5b95d1c9c09bfeb897518867444fe230e3e35e41') version('3.3.0', sha256='070530a472e7e78492f1f142c8d4b77c64de4626c4973b0589f0d18e1fcf5b4f') version('3.2.1', sha256='d4388fb5f7e0083f0c344354c9ad3b5b823e2f3f27980e56efa7785140c9b616') version('3.1.1', '158f58a79db5337e1d655ee0159b641e42ea7435') @@ -34,9 +37,7 @@ class Singularity(MakefilePackage): depends_on('libgpg-error') depends_on('squashfs', type='run') depends_on('git', when='@develop') # mconfig uses it for version info - - # TODO: add dependency to support fakeroot option, for example: - # depends_on('shadow-uidmap', type='run', when='@3.3:') + depends_on('shadow', type='run', when='@3.3:') # Go has novel ideas about how projects should be organized. # We'll point GOPATH at the stage dir, and move the unpacked src -- cgit v1.2.3-60-g2f50