update build

3 files changed, 39 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4188fe55c6af..6cc65dbe59b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
 pkgbase = cxo
 	pkgdesc = CX Object Storage System for the Skycoin Blockchain
 	pkgver = 3.1.0
-	pkgrel = 4
-	url = https://github.com/skycoinproject/cxo
+	pkgrel = 5
+	url = https://
 	arch = any
 	makedepends = go
 	makedepends = dep
-	makedepends = skycoin-keyring
-	source = https://github.com/skycoinproject/cxo/archive/v3.1.0.tar.gz
-	source = PKGBUILD.sig
-	validpgpkeys = DE08F924EEE93832DABC642CA8DC761B1C0C0CFC
-	validpgpkeys = 98F934F04F9334B81DFA3398913BBD5206B19620
+	makedepends = musl
+	makedepends = kernel-headers-musl
+	source = https://github.com/skycoin/cxo/archive/v3.1.0.tar.gz
 	sha256sums = e4fc5221d89b0f548a0093c944829c0b3e94f96efcc339effc5fea34f4accbd3
-	sha256sums = SKIP
 
 pkgname = cxo
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 6f9a36d9b376..4e54b0c60f26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,51 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 pkgname=cxo
-pkgname1=cxo
-projectname=skycoin
-githuborg=skycoinproject
+_pkgname=cxo
+_projectname=skycoin
+_githuborg=${_projectname}
 pkgdesc="CX Object Storage System for the Skycoin Blockchain"
 pkgver=3.1.0
-pkggopath="github.com/${githuborg}/${pkgname1}"
-pkgrel=4
+pkggopath="github.com/${_githuborg}/${_pkgname}"
+pkgrel=5
 arch=('any')
-url="https://${pkggopath}"
+url="https://${_pkggopath}"
 license=()
-makedepends=('go' 'dep' 'skycoin-keyring')
-source=("https://${pkggopath}/archive/v${pkgver}.tar.gz"
-"PKGBUILD.sig")
-sha256sums=('e4fc5221d89b0f548a0093c944829c0b3e94f96efcc339effc5fea34f4accbd3'
-'SKIP')
-validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
-                           '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
+makedepends=('go' 'dep' 'musl' 'kernel-headers-musl')
+source=("https://${pkggopath}/archive/v${pkgver}.tar.gz")
+sha256sums=('e4fc5221d89b0f548a0093c944829c0b3e94f96efcc339effc5fea34f4accbd3')
+#validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
+#                           '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
 
 
 prepare() {
-  gpg --import key
+  #gpg --import key
   #verify PKGBUILD signature
-  gpg --verify ../PKGBUILD.sig ../PKGBUILD
-  mkdir -p ${srcdir}/go/src/${pkggopath//${pkgname1}/} ${srcdir}/go/bin
-  ln -rTsf ${srcdir}/${pkgname1}-${pkgver} ${srcdir}/go/src/${pkggopath}
-  cd ${srcdir}/go/src/${pkggopath}/
+  #gpg --verify ../PKGBUILD.sig ../PKGBUILD
+  mkdir -p ${srcdir}/go/src/${_pkggopath//${_pkgname}/} ${srcdir}/go/bin
+  ln -rTsf ${srcdir}/${_pkgname}-${pkgver} ${srcdir}/go/src/${_pkggopath}
+  cd ${srcdir}/go/src/${_pkggopath}/
   #git submodule --quiet update --init --recursive
   export GOPATH="${srcdir}"/go
   export GOBIN=${GOPATH}/bin
-  export PATH=${GOPATH}/bin:${PATH}
+  #export PATH=${GOPATH}/bin:${PATH}
   msg2 'installing go dependencies'
   #dep init
   dep ensure
-  cmddir=${srcdir}/go/src/github.com/${githuborg}/${pkgname1}/cmd
+}
+
+build() {
+export GOPATH="${srcdir}"/go
+export GOBIN=${GOPATH}/bin
+export CC=musl-gcc
+  _cmddir=${srcdir}/go/src/github.com/${_githuborg}/${_pkgname}/cmd
   #using go build for determinism
-	cd ${cmddir}/cxocli
+	cd ${_cmddir}/cxocli
   msg2 'building cxocli binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/cxod
+  go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ .
+  cd ${_cmddir}/cxod
   msg2 'building cxod binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+  go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ .
   #binary transparency
   cd $GOBIN
   msg2 'binary sha256sums'
@@ -52,14 +56,12 @@ prepare() {
 package() {
   options=(!strip staticlibs)
   mkdir -p ${pkgdir}/usr/bin
-  mkdir -p ${pkgdir}/usr/lib/${projectname}/go/bin
-  export GOPATH=${pkgdir}/usr/lib/${projectname}/go
-  export GOBIN=${pkgdir}/usr/lib/${projectname}/go/bin
-  cxobin="${srcdir}"/go/bin
-  cxobins=$( ls $cxobin )
-    for i in ${cxobins}; do
-      install -Dm755 ${srcdir}/go/bin/${i} ${pkgdir}/usr/lib/${projectname}/go/bin/${i}
-      ln -rTsf ${pkgdir}/usr/lib/${projectname}/go/bin/${i} ${pkgdir}/usr/bin/${i}
+  mkdir -p ${pkgdir}/opt/${_pkgname}/bin
+  _cxobin=${srcdir}/go/bin
+  _cxobins=$( ls $_cxobin )
+    for i in ${_cxobins}; do
+      install -Dm755 ${srcdir}/go/bin/${i} ${pkgdir}/opt/${_pkgname}/bin/${i}
+      ln -rTsf ${pkgdir}/opt/${_pkgname}/bin/${i} ${pkgdir}/usr/bin/${i}
       chmod 755 ${pkgdir}/usr/bin/${i}
     done
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
deleted file mode 100644
index d20f924ac539..000000000000
--- a/PKGBUILD.sig
+++ /dev/null