From 21e95e41413b81d239a5fdd8e81fb212cf792b88 Mon Sep 17 00:00:00 2001 From: George Hartzell Date: Wed, 2 Oct 2019 09:59:11 -0700 Subject: [PATCH] Singularity 3.4.1 still needs the makefile patch (#13008) * Singularity 3.4.1 still needs the makefile patch * Constrain build patch to 3.4.0:3.4.1 --- var/spack/repos/builtin/packages/singularity/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index ba0929c02b..ed6322304f 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -41,7 +41,7 @@ class Singularity(MakefilePackage): depends_on('shadow', type='run', when='@3.3:') depends_on('cryptsetup', type=('build', 'run'), when='@3.4:') - patch('singularity_v3.4.0_remove_root_check.patch', level=0, when='@3.4.0') + patch('singularity_v3.4.0_remove_root_check.patch', level=0, when='@3.4.0:3.4.1') # Go has novel ideas about how projects should be organized. # We'll point GOPATH at the stage dir, and move the unpacked src