Fixed changes in paths, fixed pkgver().

2 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ed941a5fe60..41b5bb3e21bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,23 @@
 pkgbase = seaweedfs-git
 	pkgdesc = Seaweed-FS is a simple and highly scalable distributed file system, written on Go.
-	pkgver = 912.7d1e9a6
+	pkgver = r2225.7d8ce080
 	pkgrel = 1
 	url = https://github.com/chrislusf/seaweedfs
 	arch = i686
 	arch = x86_64
+	arch = aarch64
+	arch = armv7h
+	arch = armv6h
+	arch = arm
 	license = APACHE
 	makedepends = git
 	makedepends = go
 	makedepends = mercurial
+	makedepends = gcc
 	provides = seaweedfs
 	conflicts = seaweedfs
+	source = seaweedfs-git::git+https://github.com/chrislusf/seaweedfs
+	sha256sums = SKIP
 
 pkgname = seaweedfs-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ee406c3602e3..3d807a63ce1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,18 @@
 pkgname=seaweedfs-git
 __gitroot=github.com/chrislusf/seaweedfs
-pkgver=912.7d1e9a6
-pkgver() {
-  cd $srcdir/src/$__gitroot && \
-    echo $(git rev-list --count master).$(git rev-parse --short master) || \
-    echo "null"
-}
+pkgver=r2225.7d8ce080
 pkgrel=1
 pkgdesc="Seaweed-FS is a simple and highly scalable distributed file system, written on Go."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h' 'arm')
 url="https://github.com/chrislusf/seaweedfs"
 license=('APACHE')
 depends=( )
-makedepends=('git' 'go' 'mercurial')
+makedepends=('git' 'go' 'mercurial' 'gcc')
 provides=('seaweedfs')
 conflicts=('seaweedfs')
-_gourl=$__gitroot/go/weed
+_gourl=$__gitroot/weed
+source=("$pkgname::git+https://${__gitroot}")
+sha256sums=('SKIP')
 
 build() {
   GOPATH="$srcdir" go get -fix -v -x ${_gourl}
@@ -24,13 +21,11 @@ build() {
 package() {
   mkdir -p "$pkgdir/usr/bin"
   install -p -m755 "$srcdir/bin/"* "$pkgdir/usr/bin"
-  
-  # Package license (if available)
-  for f in LICENSE COPYING LICENSE.* COPYING.*; do
-    if [ -e "$srcdir/src/$_gourl/$f" ]; then
-      install -Dm644 "$srcdir/src/$_gourl/$f" "$pkgdir/usr/share/licenses/$pkgname/$f"
-    fi
-  done
+}
+
+pkgver() {
+  cd "$srcdir/$pkgname"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 # vim:set ts=2 sw=2 et: