From 8e62d2db14929c67a93119bb480e7d525ae67e2b Mon Sep 17 00:00:00 2001 From: easybuild Date: Thu, 8 Mar 2018 14:14:59 +0100 Subject: [PATCH] new file: b/BoltzTraP2/.BoltzTraP2-18.1.1-Py-3.6.eb.swp new file: c/CUDA/CUDA-9.1.85.eb new file: s/Singularity/Singularity-2.4.4-build.patch new file: s/Singularity/Singularity-2.4.4-functions.patch modified: s/Singularity/Singularity-2.4.4.eb deleted: p/phono3py/.phono3py-1.12.7.46-Py-2.7.eb.swp --- b/BoltzTraP2/.BoltzTraP2-18.1.1-Py-3.6.eb.swp | Bin 0 -> 4096 bytes c/CUDA/CUDA-9.1.85.eb | 18 ++++++++++++++++++ p/phono3py/.phono3py-1.12.7.46-Py-2.7.eb.swp | Bin 12288 -> 0 bytes s/Singularity/Singularity-2.4.4-build.patch | 11 +++++++++++ .../Singularity-2.4.4-functions.patch | 11 +++++++++++ s/Singularity/Singularity-2.4.4.eb | 5 +++++ 6 files changed, 45 insertions(+) create mode 100644 b/BoltzTraP2/.BoltzTraP2-18.1.1-Py-3.6.eb.swp create mode 100644 c/CUDA/CUDA-9.1.85.eb delete mode 100644 p/phono3py/.phono3py-1.12.7.46-Py-2.7.eb.swp create mode 100644 s/Singularity/Singularity-2.4.4-build.patch create mode 100644 s/Singularity/Singularity-2.4.4-functions.patch diff --git a/b/BoltzTraP2/.BoltzTraP2-18.1.1-Py-3.6.eb.swp b/b/BoltzTraP2/.BoltzTraP2-18.1.1-Py-3.6.eb.swp new file mode 100644 index 0000000000000000000000000000000000000000..3352aac415163bf69bfb63c462140d0e430f9a6a GIT binary patch literal 4096 zcmYc?2=nw+FxN9-00IF9hGVCuNA6v*(coaaT z^b-pTiuK{9f?3J=d1;yH#k!d#CYkz4`cC;dB~>9si2+7POkG0@JwrW1-GEA6V?8sy z)Fi@Ijj9+8fzc4a2mxLOVoE_&6Fe zjQ1GR7tg-<>e}-+wyrWJg>7alRnGm|D@Lgosv5k)V7(LzV{E*M+TLZl%GJV#$_-U) zVpHf!r>5E5gh`YPBJ6JzPMgr*$=QFui7bc!5qO!v7E1?7-_LLNuJaGxzx%QY%@6@1 zKm>>Y5g-CYfCvx)BJjT@;LH{F7}?=-za1a0uUGzYT|d%=2oM1xKm>>Y5g-CYfCvx) zB0vO)01>p&y~A&|~Nv`VR7Y$RQd;fCvx)B0vO)01+Sp zM1Tmq)&!P%zA9x_3Tyc-9+;xB0b}9m9W{u2##Z6mx&wQwUgkTeY z7v4TP3P({I_0f7f7>6f^)5D`r!W2RKSU;^-65E_hIL~F3De1HO5?$2BDP8%8Z-XxN zN-Sk?(`VkLdd}>bGS*4cx&%&I7u;v2ma4K&lqEuRs2T?sZlzn9$TWPt%)=12xq5hO zXLmg{SM{Fd+X3I^qSCIAH7`VV=3};9-2WD_UF`herZUOl3s+mT{@iJGnUh8C&s*~p1HT0BBdo#of7y6jRdoHO=j9Gk`{WaQI}biIfT zHY*m=#$rF7q;V=HSvJX&bT|`9J{Dpy9Erg=I}rUrl8)s#pNMgqB=h`WEaYf^G@FS@ ze?Q4a^E}3DnbW$=3ZbgD3@-{WZI9V{o4z7AA;CFA5p7nhwr;TR^?Ij;vfS$2eIshg zGf`%%QlLz{EnyXQ7u3VaT4cW7yq4Z#&P}b2tR0R6;;=$5r9ol{8~EIP>fI@bIy5=5 zmr*6%rt3XcI8P6w!YxbuOxBzA{+n+2fcb>{R2vH|^Dt~%>r0)T`3$Bl*=Yy0hmK!< Sd^$X?D*ZrohjY+R4%lCv30G18 diff --git a/s/Singularity/Singularity-2.4.4-build.patch b/s/Singularity/Singularity-2.4.4-build.patch new file mode 100644 index 00000000..76ea365a --- /dev/null +++ b/s/Singularity/Singularity-2.4.4-build.patch @@ -0,0 +1,11 @@ +--- libexec/cli/build.exec.old 2018-03-08 13:52:42.786096197 +0100 ++++ libexec/cli/build.exec 2018-03-08 13:53:29.989946615 +0100 +@@ -365,7 +365,7 @@ + else + OPTS="" + fi +- if ! mksquashfs "$SINGULARITY_ROOTFS/" "$SINGULARITY_CONTAINER_OUTPUT" -noappend $OPTS > /dev/null; then ++ if ! $EBROOTSQUASHFSMINTOOLS/bin/mksquashfs "$SINGULARITY_ROOTFS/" "$SINGULARITY_CONTAINER_OUTPUT" -noappend $OPTS > /dev/null; then + message ERROR "Failed squashing image, left template directory at: $SINGULARITY_ROOTFS\n" + exit 1 + fi diff --git a/s/Singularity/Singularity-2.4.4-functions.patch b/s/Singularity/Singularity-2.4.4-functions.patch new file mode 100644 index 00000000..7f0020b6 --- /dev/null +++ b/s/Singularity/Singularity-2.4.4-functions.patch @@ -0,0 +1,11 @@ +--- libexec/functions.old 2018-03-08 13:54:43.649714037 +0100 ++++ libexec/functions 2018-03-08 13:55:38.831537894 +0100 +@@ -290,7 +290,7 @@ + return 0 + fi + esac +- for p in `echo $PATH | sed -e 's/:/ /g'`; do ++ for p in `echo "$PATH:$EBROOTSQUASHFSMINTOOLS/bin" | sed -e 's/:/ /g'`; do + if [ -f "$p/$i" -a -x "$p/$i" ]; then + echo "$p/$i" + return 0 diff --git a/s/Singularity/Singularity-2.4.4.eb b/s/Singularity/Singularity-2.4.4.eb index c3cb5655..6987a63f 100644 --- a/s/Singularity/Singularity-2.4.4.eb +++ b/s/Singularity/Singularity-2.4.4.eb @@ -13,6 +13,11 @@ toolchain = {'name': 'dummy', 'version': ''} source_urls = ['https://github.com/singularityware/singularity/releases/download/%(version)s'] sources = [SOURCELOWER_TAR_GZ] +patches = [ + 'Singularity-2.4.4-build.patch', + 'Singularity-2.4.4-functions.patch' +] + dependencies = [ ('squashfs-tools', '4.3'), ]