fix build errors, update PKGBUILD

2 files changed, 45 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 67d2520605fa..8cb2e7075d63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,26 @@
 pkgbase = skycoin-hardware-wallet-go
 	pkgdesc = Go bindings and CLI tool for the Skycoin hardware wallet
 	pkgver = autogenerated
-	pkgrel = 1
+	pkgrel = 3
 	url = https://github.com/SkycoinProject/hardware-wallet-go
-	arch = any
-	makedepends = dep
+	arch = i686
+	arch = x86_64
+	arch = aarch64
+	arch = armv8
+	arch = armv7
+	arch = armv7l
+	arch = armv7h
+	arch = armv6h
+	arch = armhf
+	arch = armel
+	arch = arm
 	makedepends = git
 	makedepends = go
-	makedepends = gcc
-	source = git+https://github.com/SkycoinProject/hardware-wallet-go.git#branch=master
-	source = https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key
+	makedepends = musl
+	makedepends = kernel-headers-musl
+	source = git+https://github.com/SkycoinProject/hardware-wallet-go.git
 	sha256sums = SKIP
-	sha256sums = 41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14
 
 pkgname = skycoin-hardware-wallet-go
 	options = !strip
 	options = staticlibs
-
diff --git a/PKGBUILD b/PKGBUILD
index 0d7b760daed8..b9a11ee7a229 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,24 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 pkgname=skycoin-hardware-wallet-go
-pkgname1=hardware-wallet-go
-projectname=skycoin
-githuborg=SkycoinProject
+_pkgname=hardware-wallet-go
+_projectname=skycoin
+_githuborg=SkycoinProject
 pkgdesc="Go bindings and CLI tool for the Skycoin hardware wallet"
 pkgver='autogenerated'
-pkggopath="github.com/${githuborg}/${pkgname1}"
-pkgrel=1
-arch=('any')
-url="https://${pkggopath}"
+#pkgver='autogenerated'
+_pkggopath="github.com/${_githuborg}/${_pkgname}"
+pkgrel=3
+#pkgrel=3
+arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
+url="https://${_pkggopath}"
 license=()
-makedepends=(dep git go gcc)
-source=("git+${url}.git#branch=${BRANCH:-master}"
-"https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key")
-sha256sums=('SKIP'
-'41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14')
-
-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
+makedepends=('git' 'go' 'musl' 'kernel-headers-musl')
+source=("git+${url}.git") #branch=${BRANCH:-master}"
+sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname1}"
+	cd "${srcdir}/${_pkgname}"
 	local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
 	local count=$(git rev-list --count HEAD)
 	local commit=$(git rev-parse --short HEAD)
@@ -42,31 +26,24 @@ pkgver() {
 }
 
 prepare() {
-	gpg --import key
-	#verify PKGBUILD signature
-	gpg --verify ../PKGBUILD.sig ../PKGBUILD
+
 	# https://wiki.archlinux.org/index.php/Go_package_guidelines
-	mkdir -p ${srcdir}/go/src/github.com/${githuborg}/ ${srcdir}/go/bin
-	ln -rTsf ${srcdir}/${pkgname1} ${srcdir}/go/src/github.com/${githuborg}/${pkgname1}
-	cd ${srcdir}/go/src/github.com/${githuborg}/${pkgname1}
-	#git submodule --quiet update --init --recursive
-	export GOPATH="${srcdir}"/go
-	export GOBIN=${GOPATH}/bin
-	export PATH=${GOPATH}/bin:${PATH}
-	msg2 'installing go dependencies'
-	dep ensure -v
+	mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin
+	ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/github.com/${_githuborg}/${_pkgname}
+
 }
 
 build() {
 ## manually build
 export GOPATH="${srcdir}"/go
 export GOBIN=${GOPATH}/bin
-export PATH=${GOPATH}/bin:${PATH}
-cd ${srcdir}/go/src/github.com/${githuborg}/${pkgname1}/cmd
-go install \
-  -gcflags "all=-trimpath=${GOPATH}" \
-  -asmflags "all=-trimpath=${GOPATH}" \
-  -v ./...
+export CC=musl-gcc
+cd ${srcdir}/go/src/github.com/${_githuborg}/${_pkgname}/
+[[ ! -f go.mod ]] && go mod init
+go mod tidy
+cd ${srcdir}/go/src/github.com/${_githuborg}/${_pkgname}/cmd/cli
+go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN .
+
 
 cd ${srcdir}/go/bin
 mv cli skycoin-hw-cli
@@ -76,16 +53,16 @@ package() {
 options=(!strip staticlibs)
 #create directory trees
 mkdir -p ${pkgdir}/usr/bin
-mkdir -p ${pkgdir}/usr/lib/${projectname}/go/bin
+mkdir -p ${pkgdir}/opt/${_pkgname}/bin
 #install binaries & symlink to /usr/bin
 msg2 'installing binaries'
-skybin="${srcdir}"/go/bin
+_skybin="${srcdir}"/go/bin
 #avoid generic names for binaries
 #collect the binaries & install
-skybins=$( ls "$skybin")
-for i in ${skybins}; 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}
+_skybins=$( ls "${_skybin}")
+for i in ${_skybins}; 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
 }