Use new rfs (#1428)

* new rfs * use correct hash * optimize build process
threefoldtech · Oct 12, 2021 · 71f76f9 · 71f76f9
1 parent ed1f15d
commit 71f76f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 45 deletions.
diff --git a/.github/workflows/bins-extra-development.yaml b/.github/workflows/bins-extra-development.yaml
@@ -261,12 +261,6 @@ jobs:
     name: "Package: zufs (0-fs)"
     runs-on: ubuntu-18.04
     steps:
-      - name: Set up Go 1.15
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.15
-        id: go
-
       - name: Checkout code into the Go module directory
         uses: actions/checkout@v1
 

diff --git a/.github/workflows/bins-extra-pre-release.yaml b/.github/workflows/bins-extra-pre-release.yaml
@@ -374,12 +374,6 @@ jobs:
     name: "Package: zufs (0-fs)"
     runs-on: ubuntu-18.04
     steps:
-      - name: Set up Go 1.15
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.15
-        id: go
-
       - name: Checkout code into the Go module directory
         uses: actions/checkout@v1
 

diff --git a/.github/workflows/bins-extra-release.yaml b/.github/workflows/bins-extra-release.yaml
@@ -375,12 +375,6 @@ jobs:
     name: "Package: zufs (0-fs)"
     runs-on: ubuntu-18.04
     steps:
-      - name: Set up Go 1.15
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.15
-        id: go
-
       - name: Checkout code into the Go module directory
         uses: actions/checkout@v1
 

diff --git a/bins/packages/zufs/zufs.sh b/bins/packages/zufs/zufs.sh
@@ -1,51 +1,29 @@
-ZUFS_VERSION="2.0.8"
-ZUFS_CHECKSUM="d30d3cc6773f9fbfc538eb4e6560e1ec"
-ZUFS_LINK="https://github.com/threefoldtech/0-fs/archive/v${ZUFS_VERSION}.tar.gz"
-
-dependencies_zufs() {
-    apt-get install -y git btrfs-progs libseccomp-dev build-essential pkg-config
-
-    . ${PKGDIR}/../golang/golang.sh
-    build_golang
-}
+ZUFS_VERSION="0.2.2"
+ZUFS_CHECKSUM="f350a6d519011d464a3adee636942e0e"
+ZUFS_LINK="https://github.com/threefoldtech/rfs/releases/download/v${ZUFS_VERSION}/rfs"
 
 download_zufs() {
-    download_file ${ZUFS_LINK} ${ZUFS_CHECKSUM} 0-fs-${ZUFS_VERSION}.tar.gz
+    download_file ${ZUFS_LINK} ${ZUFS_CHECKSUM} rfs-${ZUFS_VERSION}
 }
 
-extract_zufs() {
-    tar -xf ${DISTDIR}/0-fs-${ZUFS_VERSION}.tar.gz -C ${WORKDIR}
-}
 
 prepare_zufs() {
     echo "[+] prepare 0-fs"
     github_name "0-fs-${ZUFS_VERSION}"
 }
 
-compile_zufs() {
-    echo "[+] compiling 0-fs"
-    make
-}
-
 install_zufs() {
     echo "[+] install 0-fs"
 
     mkdir -p "${ROOTDIR}/sbin"
-    cp -av g8ufs "${ROOTDIR}/sbin/"
+    cp -av rfs-${ZUFS_VERSION} "${ROOTDIR}/sbin/g8ufs"
 }
 
 build_zufs() {
     pushd "${DISTDIR}"
 
-    dependencies_zufs
     download_zufs
-    extract_zufs
-
-    popd
-    pushd ${WORKDIR}/0-fs-${ZUFS_VERSION}
-
     prepare_zufs
-    compile_zufs
     install_zufs
 
     popd