From 9ffe6bc7763e5b70638e752cfc608d17807e95bb Mon Sep 17 00:00:00 2001
From: chunlin <fangchunlin@huawei.com>
Date: Fri, 20 May 2022 03:31:22 +0000
Subject: [PATCH 1/3] update package/go/1.18/install.sh.

---
 package/go/1.18/install.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/package/go/1.18/install.sh b/package/go/1.18/install.sh
index 2c13298..c8c5894 100755
--- a/package/go/1.18/install.sh
+++ b/package/go/1.18/install.sh
@@ -3,10 +3,13 @@
 set -x
 set -e
 cd ${JARVIS_TMP}
-file_name='go1.18.linux-arm64.tar.gz'
-if [ ! -f "${JARVIS_DOWNLOAD}/${file_name}" ]; then
-wget --no-check-certificate -P ${JARVIS_DOWNLOAD} https://go.dev/dl/${file_name}
+# check Arch
+if [ x$(arch) = xaarch64 ];then
+    file_name='go1.18.linux-arm64.tar.gz'
+else
+    file_name='go1.18.linux-amd64.tar.gz'
 fi
+. ${DOWNLOAD_TOOL} -u  https://go.dev/dl/${file_name}
 rm -rf /usr/local/go
 tar -xzvf ${JARVIS_DOWNLOAD}/${file_name} -C /usr/local
-export PATH=/usr/local/go/bin:$PATH
+export PATH=/usr/local/go/bin:$PATH
\ No newline at end of file
-- 
Gitee


From 9022864e10f10e6381a2df22d11262e7475c9369 Mon Sep 17 00:00:00 2001
From: chunlin <fangchunlin@huawei.com>
Date: Fri, 20 May 2022 03:31:57 +0000
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=BB=BA=203.8.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package/singularity/3.8.4/.keep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 package/singularity/3.8.4/.keep

diff --git a/package/singularity/3.8.4/.keep b/package/singularity/3.8.4/.keep
new file mode 100644
index 0000000..e69de29
-- 
Gitee


From f9f000dac879404222b7df3cf09cd43eea236aaa Mon Sep 17 00:00:00 2001
From: chunlin <fangchunlin@huawei.com>
Date: Fri, 20 May 2022 03:32:51 +0000
Subject: [PATCH 3/3] add package/singularity/3.8.4/install.sh.

---
 package/singularity/3.8.4/install.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 package/singularity/3.8.4/install.sh

diff --git a/package/singularity/3.8.4/install.sh b/package/singularity/3.8.4/install.sh
new file mode 100644
index 0000000..ec625af
--- /dev/null
+++ b/package/singularity/3.8.4/install.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -x
+set -e
+cd ${JARVIS_TMP}
+export PATH=/usr/local/go/bin:$PATH
+#sudo yum install -y libseccomp-devel squashfs-tools cryptsetup
+file_noext='singularity-ce-3.8.4'
+file_name="${file_noext}.tar.gz"
+. ${DOWNLOAD_TOOL} -u  https://github.com/sylabs/singularity/releases/download/v3.8.4/${file_name}
+rm -rf ${file_noext}
+tar -xzvf ${JARVIS_DOWNLOAD}/${file_name}
+cd ${file_noext}
+./mconfig
+make -C builddir
+sudo make -C builddir install
\ No newline at end of file
-- 
Gitee