update skycoin

5 files changed, 58 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27cabca2f213..923558321a35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,16 @@
 pkgbase = skycoin
-	pkgdesc = Skycoin Cryptocurrency Wallet. Skycoin.com
-	pkgver = 0.27.0
-	pkgrel = 3
+	pkgdesc = Skycoin Cryptocurrency Wallet. skycoin.com
+	pkgver = 0.27.1
+	pkgrel = 1
 	url = https://github.com/skycoin/skycoin
 	arch = any
 	makedepends = go
-	makedepends = skycoin-keyring
-	source = https://github.com/skycoin/skycoin/archive/v0.27.0.tar.gz
+	makedepends = musl
+	makedepends = kernel-headers-musl
+	source = https://github.com/skycoin/skycoin/archive/v0.27.1.tar.gz
 	source = skycoin-scripts.tar.gz
-	source = skycoin-systemd.tar.gz
-	source = PKGBUILD.sig
-	validpgpkeys = DE08F924EEE93832DABC642CA8DC761B1C0C0CFC
-	sha256sums = 2e6c47f058f6f459e6572e6acf3e34403cf14fdc0f2511a4238b7280aae2d026
-	sha256sums = ca8344614b60e0d9d57b0eba4b44e0febc4addf83a54685539c45e08364b2d23
-	sha256sums = d14d3d597b80a2b79e5edb7e956a7926ca7065230e87fdca026036888835ad42
-	sha256sums = SKIP
+	sha256sums = 4ede6a23e62bf50f097a647519b5b714a5581065bf71c9778e0965a7c84b112b
+	sha256sums = 5e147befaf68e30efa7a15e8b292e52cacb94846de4ac03158275a357c8b7dbc
 
 pkgname = skycoin
 
diff --git a/PKGBUILD b/PKGBUILD
index acc53629a693..bcc22a457736 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,90 +3,74 @@
 pkgname=skycoin
 _pkgname=${pkgname}
 _githuborg=${_pkgname}
-pkgdesc="Skycoin Cryptocurrency Wallet. Skycoin.com"
-pkgver=0.27.0
-#pkgver=0.27.0
-pkgrel=3
-#pkgrel=3
+pkgdesc="Skycoin Cryptocurrency Wallet. skycoin.com"
+pkgver=0.27.1
+#pkgver=0.27.1
+pkgrel=1
+#pkgrel=1
 arch=('any')
-license=()
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 url="https://${_pkggopath}"
-makedepends=(go skycoin-keyring)
+makedepends=('go' 'musl' 'kernel-headers-musl')
 source=("${url}/archive/v${pkgver}.tar.gz"
 "${_pkgname}-scripts.tar.gz"
-"${_pkgname}-systemd.tar.gz"
-"PKGBUILD.sig")
-sha256sums=('2e6c47f058f6f459e6572e6acf3e34403cf14fdc0f2511a4238b7280aae2d026'
-            'ca8344614b60e0d9d57b0eba4b44e0febc4addf83a54685539c45e08364b2d23'
-            'd14d3d597b80a2b79e5edb7e956a7926ca7065230e87fdca026036888835ad42'
-            'SKIP')
-validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
+) #"PKGBUILD.sig")
+sha256sums=('4ede6a23e62bf50f097a647519b5b714a5581065bf71c9778e0965a7c84b112b'
+            '5e147befaf68e30efa7a15e8b292e52cacb94846de4ac03158275a357c8b7dbc')
+#validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
                            #'98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
 
-case "$CARCH" in
-x86)      export GOARCH="386" GO386="387" ;;
-x86_64)   export GOARCH="amd64" ;;
-arm*)     export GOARCH="arm" ;;
-armel)    export GOARCH="arm" GOARM="5" ;;
-armhf)    export GOARCH="arm" GOARM="6" ;;
-armv7)    export GOARCH="arm" GOARM="7" ;;
-armv8)    export GOARCH="arm64" ;;
-aarch64)  export GOARCH="arm64" ;;
-mips)     export GOARCH="mips" ;;
-mips64)   export GOARCH="mips64" ;;
-mips64el) export GOARCH="mips64le" ;;
-mipsel)   export GOARCH="mipsle" ;;
-*)        return 1 ;;
-	esac
+#tar -czvf skycoin-scripts.tar.gz skycoin-scripts
+#updpkgsums
 
 	prepare() {
 		#verify PKGBUILD signature
-		gpg --verify ${srcdir}/PKGBUILD.sig ../PKGBUILD
+		#gpg --verify ${srcdir}/PKGBUILD.sig ../PKGBUILD
 		mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin
 		ln -rTsf ${srcdir}/${_pkgname}-${pkgver} ${srcdir}/go/src/${_pkggopath}
 	}
 
 build() {
-	export GOPATH="${srcdir}"/go
+	export GOPATH=${srcdir}/go
 	export GOBIN=${GOPATH}/bin
+  export CC=musl-gcc
+  export CGO_ENABLED=1
 	_cmddir=${srcdir}/go/src/${_pkggopath}/cmd
-  #using go build for determinism
-	cd ${_cmddir}/address_gen
-	msg2 'building skycoin-address_gen binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${_cmddir}/cipher-testdata
-	msg2 'building skycoin-cipher-testdata binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${_cmddir}/monitor-peers
-	msg2 'building skycoin-monitor-peers binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${_cmddir}/newcoin
-	msg2 'building skycoin-newcoin binary'
-	go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${_cmddir}/skycoin-cli
-  msg2 'building skycoin-cli binary'
-	go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${_cmddir}/skycoin
-	msg2 'building skycoin binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+
+  _buildbins address_gen
+  _buildbins cipher-testdata
+  _buildbins monitor-peers
+  _buildbins newcoin
+  _buildbins skycoin
+  _buildbins skycoin-cli
 	#binary transparency
 	cd $GOBIN
-	msg2 'binary sha256sums'
+	_msg2 'binary sha256sums'
 	sha256sum $(ls)
 }
 
+_buildbins() {
+
+_binname=$1
+_msg2 "building ${_binname} binary"
+#SPEED UP TESTING OF BUILDS
+if [[ ! -f ${GOBIN}/${_binname} ]] ; then
+	cd ${_cmddir}/${_binname}
+  go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ .
+fi
+}
+
 package() {
 	#create directory trees
 	_skysrcdir=${srcdir}/${_pkgname}-${pkgver}
 	_skypath=${pkgdir}/opt/${_pkgname}
 	_skygobin=${_skypath}/bin
-	_skyguidir=${_skypath}/${_pkgname}/src/gui
+	_skyguidir=${_skypath}/src/gui
 	mkdir -p ${pkgdir}/usr/bin
 	mkdir -p ${_skygobin}
 	mkdir -p ${_skyguidir}
 	#install binaries & symlink to /usr/bin
-	msg2 'installing binaries'
+	_msg2 'installing binaries'
 	_skybin="${srcdir}"/go/bin
 	#avoid generic names for binaries
 	#collect the binaries & install
@@ -96,26 +80,31 @@ package() {
 		ln -rTsf ${_skygobin}/$i ${pkgdir}/usr/bin/${i}
 		chmod 755 ${pkgdir}/usr/bin/${i}
 	done
+  _msg2 'installing gui sources'
 	#install the web dir (UI)
 	cp -r ${_skysrcdir}/src/gui/static ${_skyguidir}
+  _msg2 'installing scripts'
 	#install the scripts
-	cd ${srcdir}/${_pkgname}-scripts/
-	_skycoinscripts=$( ls )
+	_skycoinscripts=$( ls --ignore=*.service ${srcdir}/${_pkgname}-scripts/ )
 	for i in $_skycoinscripts; do
 		install -Dm755 ${srcdir}/${_pkgname}-scripts/${i} ${_skygobin}/${i}
 		ln -rTsf ${_skygobin}/${i} ${pkgdir}/usr/bin/${i}
 		chmod 755 ${pkgdir}/usr/bin/${i}
 	done
+  _msg2 'installing systemd services'
+  #install the system.d service
+    install -Dm644 ${srcdir}/${_pkgname}-scripts/skycoin-node.service ${pkgdir}/usr/lib/systemd/system/skycoin-node.service
+  _msg2 'correcting symlink names'
 	#correct symlink names
 	cd ${pkgdir}/usr/bin/
 	_namechange=$(ls --ignore='skycoin*')
 	for i in $_namechange; do
 		mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/${_pkgname}-${i}
 	done
-	#install the system.d service
-	cd ${srcdir}/${_pkgname}-systemd/
-	_skysystemd=$( ls )
-	for i in $_skysystemd; do
-	install -Dm644 ${srcdir}/${_pkgname}-systemd/${i} ${pkgdir}/usr/lib/systemd/system/${i}
-done
+}
+
+_msg2() {
+(( QUIET )) && return
+local mesg=$1; shift
+printf "${BLUE}  ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
deleted file mode 100644
index 819a0b89ed4d..000000000000
--- a/PKGBUILD.sig
+++ /dev/null
diff --git a/skycoin-scripts.tar.gz b/skycoin-scripts.tar.gz
index 50bc1e13d2e1..b4c9e1e850ac 100644
--- a/skycoin-scripts.tar.gz
+++ b/skycoin-scripts.tar.gz
diff --git a/skycoin-systemd.tar.gz b/skycoin-systemd.tar.gz
deleted file mode 100644
index 7b786d4701ec..000000000000
--- a/skycoin-systemd.tar.gz
+++ /dev/null