update to match skybian

3 files changed, 54 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e59371d39ead..823d1b9e8203 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,20 @@
 pkgbase = skywire
 	pkgdesc = Skywire: Building a New Internet. Skycoin.com
 	pkgver = 0.2.0
-	pkgrel = 2
-	url = https://github.com/SkycoinProject/skywire-mainnet
+	pkgrel = 3
+	url = https://github.com/SkycoinProject/skybian
 	arch = x86_64
 	arch = aarch64
 	arch = armv7
 	arch = armv8
 	makedepends = git
+	makedepends = go
 	makedepends = skycoin-keyring
 	source = git+https://github.com/SkycoinProject/skybian.git#branch=develop
-	source = skywire-scripts.tar.gz
-	source = hypervisorconfigPKGBUILD
 	source = PKGBUILD.sig
 	validpgpkeys = DE08F924EEE93832DABC642CA8DC761B1C0C0CFC
 	validpgpkeys = 98F934F04F9334B81DFA3398913BBD5206B19620
 	sha256sums = SKIP
-	sha256sums = a5f90034db1b199a3fede6b2b23453e234aa366c1ee06dbe3ddfc16f26a0c3a7
-	sha256sums = 399926d8addcde6bb588a67739971525f953060b83693cb2a7a081480c4c5091
 	sha256sums = SKIP
 	source_x86_64 = https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-amd64.tar.gz
 	sha256sums_x86_64 = 988a9925b1650424a97836951b284e633fc78e857b908d65e40cbf6d18eb96d7
diff --git a/PKGBUILD b/PKGBUILD
index a6176f7c0f7a..9b206293f82b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,36 +2,58 @@
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 projectname=skycoin
 pkgname=skywire
+pkgname1=skybian
 githuborg=SkycoinProject
 pkgdesc="Skywire: Building a New Internet. Skycoin.com"
 pkgver=0.2.0
-pkggopath="github.com/${githuborg}/${pkgname}-mainnet"
-pkgrel=2
+pkggopath="github.com/${githuborg}/${pkgname1}"
+pkgrel=3
 arch=('x86_64' 'aarch64' 'armv7' 'armv8')
 url="https://${pkggopath}"
 license=()
-makedepends=(git skycoin-keyring)
+makedepends=(git go skycoin-keyring)
 #source=("git+${url}.git#branch=${BRANCH:-develop}"
 source=("git+https://github.com/SkycoinProject/skybian.git#branch=${BRANCH:-develop}"
-"skywire-scripts.tar.gz"
-"hypervisorconfigPKGBUILD"
 "PKGBUILD.sig")
 sha256sums=('SKIP'
-'a5f90034db1b199a3fede6b2b23453e234aa366c1ee06dbe3ddfc16f26a0c3a7'
-'399926d8addcde6bb588a67739971525f953060b83693cb2a7a081480c4c5091'
-'SKIP')
-source_x86_64=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-amd64.tar.gz")
+            'SKIP')
 sha256sums_x86_64=('988a9925b1650424a97836951b284e633fc78e857b908d65e40cbf6d18eb96d7')
-source_aarch64=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-arm64.tar.gz")
 sha256sums_aarch64=('5ee60c5b7ce63999520167ab44b7f3b7a2328ea9ebbbabe043cc5245b50d5a81')
-source_armv7=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-armv7.tar.gz")
 sha256sums_armv7=('6ebadb2b6dbba87a060993560fe957d617f40ca7e467129889d51baebe57fa47')
-source_armv8=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-arm64.tar.gz")
 sha256sums_armv8=('5ee60c5b7ce63999520167ab44b7f3b7a2328ea9ebbbabe043cc5245b50d5a81')
+source_x86_64=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-amd64.tar.gz")
+source_aarch64=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-arm64.tar.gz")
+source_armv7=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-armv7.tar.gz")
+source_armv8=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-arm64.tar.gz")
 
 validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
 '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
-#tar -czvf skywire-scripts.tar.gz skywire-scripts
+
+
+export GOOS=linux
+export GOPATH="${srcdir}"
+export GOROOT="$builddir"
+export GOBIN="$GOROOT"/bin
+export GOROOT_FINAL=/usr/lib/go
+
+export CGO_ENABLED=1
+
+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
+
 
 
 prepare() {
@@ -40,6 +62,19 @@ prepare() {
 	# https://wiki.archlinux.org/index.php/Go_package_guidelines
 }
 
+build() {
+	mkdir -p ${srcdir}/go/src/github.com/${githuborg}/ ${srcdir}/go/bin
+  ln -rTsf ${srcdir}/${pkgname1} ${srcdir}/go/src/${pkggopath}
+  cd ${srcdir}/go/src/${pkggopath}/
+  export GOPATH="${srcdir}"/go
+  export GOBIN=${GOPATH}/bin
+  export PATH=${GOPATH}/bin:${PATH}
+	cmddir=${srcdir}/go/src/${pkggopath}/cmd
+	#using go build for determinism
+	cd ${cmddir}/skyconf
+	msg2 'building skyconf binary'
+	go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+}
 
 package() {
     options=(!strip staticlibs)
@@ -56,14 +91,9 @@ package() {
   install -Dm755 ${srcdir}/apps/skychat ${pkgdir}/usr/bin/apps/skychat
   install -Dm755 ${srcdir}/apps/skysocks ${pkgdir}/usr/bin/apps/skysocks
   install -Dm755 ${srcdir}/apps/skysocks-client ${pkgdir}/usr/bin/apps/skysocks-client
-#  install -Dm755 ${srcdir}/skybian/static/skywire-startup ${pkgdir}/usr/bin/apps/skywire-startup
-#  install -Dm755 ${srcdir}/${pkgname}-scripts/skywire-setuser.sh ${pkgdir}/usr/bin/skywire-setuser
-#  install -Dm755 ${srcdir}/${pkgname}-scripts/skywire-config.sh ${pkgdir}/usr/bin/skywire-config
-#  install -Dm755 ${srcdir}/${pkgname}-scripts/hypervisor-config.sh ${pkgdir}/usr/bin/hypervisor-config
-#  install -Dm755 ${srcdir}/${pkgname}-scripts/skywire-user-config.sh ${pkgdir}/usr/bin/skywire-user-config
+	install -Dm755 ${srcdir}/skybian/static/skywire-startup ${pkgdir}/usr/bin/skywire-startup
+	install -Dm755 ${srcdir}/go/bin/skyconf ${pkgdir}/usr/bin/skyconf
 
-#install hypervisorconfig PKGBUILD
-#  install -Dm644  ${srcdir}/hypervisorconfigPKGBUILD  ${pkgdir}/usr/lib/${projectname}/${pkgname}/hypervisorconfig/PKGBUILD
   #install the system.d services
-#	install -Dm644 ${srcdir}/skybian/static/skywire-startup.service ${pkgdir}/usr/lib/systemd/system/skywire-startup.service
+	install -Dm644 ${srcdir}/skybian/static/skywire-startup.service ${pkgdir}/etc/systemd/system/skywire-startup.service
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
index 8a65d227ed00..7453d765ab96 100644
--- a/PKGBUILD.sig
+++ b/PKGBUILD.sig