summaryrefslogtreecommitdiff
path: root/var/spack/repos/builtin/packages/singularity/singularity_v3.4.0_remove_root_check.patch
diff options
context:
space:
mode:
authorOwen Solberg <odoublewen@users.noreply.github.com>2019-09-12 13:45:00 -0700
committerPeter Scheibel <scheibel1@llnl.gov>2019-09-12 13:45:00 -0700
commit78f3f4c309335576686525339c22c029ddb6e86f (patch)
tree345cc83213b9d8668cf551021c5df6e2cfa653b3 /var/spack/repos/builtin/packages/singularity/singularity_v3.4.0_remove_root_check.patch
parent660887674769ca5c0c48c7769f6a7d5c3bfa9bff (diff)
downloadspack-78f3f4c309335576686525339c22c029ddb6e86f.tar.gz
spack-78f3f4c309335576686525339c22c029ddb6e86f.tar.bz2
spack-78f3f4c309335576686525339c22c029ddb6e86f.tar.xz
spack-78f3f4c309335576686525339c22c029ddb6e86f.zip
Singularity package: add version 3.4.0 (#12785)
This version in combination with the included patch can install without root.
Diffstat (limited to 'var/spack/repos/builtin/packages/singularity/singularity_v3.4.0_remove_root_check.patch')
-rw-r--r--var/spack/repos/builtin/packages/singularity/singularity_v3.4.0_remove_root_check.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/singularity/singularity_v3.4.0_remove_root_check.patch b/var/spack/repos/builtin/packages/singularity/singularity_v3.4.0_remove_root_check.patch
new file mode 100644
index 0000000000..ee91b72985
--- /dev/null
+++ b/var/spack/repos/builtin/packages/singularity/singularity_v3.4.0_remove_root_check.patch
@@ -0,0 +1,17 @@
+--- mlocal/frags/build_runtime_suid.mk 2019-08-30 20:43:13.000000000 -0700
++++ mlocal/frags/build_runtime_suid.mk 2019-09-10 12:21:09.120567773 -0700
+@@ -11,10 +11,10 @@
+ -o $@ $(SOURCEDIR)/cmd/starter/main_linux.go
+
+ $(starter_suid_INSTALL): $(starter_suid)
+- @if [ `id -u` -ne 0 -a -z "${RPM_BUILD_ROOT}" ] ; then \
+- echo "SUID binary requires to execute make install as root, use sudo make install to finish installation"; \
+- exit 1 ; \
+- fi
++# @if [ `id -u` -ne 0 -a -z "${RPM_BUILD_ROOT}" ] ; then \
++# echo "SUID binary requires to execute make install as root, use sudo make install to finish installation"; \
++# exit 1 ; \
++# fi
+ @echo " INSTALL SUID" $@
+ $(V)install -d $(@D)
+ $(V)install -m 4755 $(starter_suid) $(starter_suid_INSTALL)