update to 0.4.0

1 files changed, 13 insertions, 55 deletions

diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index b86342b85d4f..bd55553b79ef 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -7,20 +7,14 @@ _githuborg=${_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Develop Banch. Debian package"
 #set to native architecture with dpkg
 _pkgarch=$(dpkg --print-architecture)
-#Uncoment to select architecture - cross compile not working currently
-#_pkgarch=amd64
-#_pkgarch=arm64
-#_pkgarch=armhf
 #leave arch package as any
 arch=('any')
 #manually version for now
-_pkgver='0.3.0'
-#_tag_ver='v0.3.0'
+_pkgver='0.4.0'
+#_tag_ver='v0.4.0'
 pkgver=${_pkgver}
-#pkgver='autogenerated'
-#pkgrel keeps getting reset when build is run
-_pkgrel=3
-#pkgrel=3
+_pkgrel=1
+#pkgrel=1
 pkgrel=${_pkgrel}
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 url="https://${_pkggopath}"
@@ -31,44 +25,19 @@ depends=()
 _debdeps="reprepro"
 #_debdeps=""
 _scripts="skywire-deb-scripts"
-#source=("git+${url}.git#branch=${BRANCH:-develop}"
-#build to needed commit because of develop branch instability
-source=("git+${url}.git" ##branch=${BRANCH:-develop}"
+source=("git+${url}.git#branch=${BRANCH:-develop}"
 "${_scripts}.tar.gz"  )
-#'deb.PKGBUILD.sig'   #skip the pgp checks for now as makepkg and yay handle it differently
-#'deb.PKGBUILD')
 sha256sums=('SKIP'
-            '418772371bcf4a7bcae764e29bfb9cd6e71dd63d05954c7dd381c078d50b1d4c')
-#            'SKIP'
-#            'SKIP')
-#validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
+            'f993e28400f72a05500f0b091d6d308c5a4a1299a2490ff0ecb5b59b0805e5b1')
 
 #tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts
 #updpkgsums deb.PKGBUILD
 
-#omit this and manually version for now
-#pkgver() {
-	#cd "${srcdir}/${_pkgname}"
-  #local _version=$(git describe --abbrev=0 | tr --delete v)
-	#local _version=${_version//-/_}
-	#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)
-	#echo "${_pkgver}_${_date}.${_count}_${_commit}_${BRANCH:-develop}"
-#  echo "${_pkgver}"
-#}
-
 prepare() {
-#skip signature verification for now because yay handles it differently than makepkg
-	#verify PKGBUILD signature
-#	gpg --verify ${srcdir}/deb.PKGBUILD.sig ${srcdir}/deb.PKGBUILD
-
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
 	mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin.${_pkgarch} ${srcdir}/go/apps.${_pkgarch}
   ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath}
   cd ${srcdir}/go/src/${_pkggopath}/
-
-  [[ $CARCH == "x86_64" ]] && git checkout develop || git checkout d156980280fdb2ddfc8765ff77cdd55c0b7e9d9c
 }
 
 build() {
@@ -77,14 +46,7 @@ local GOBIN=${GOPATH}/bin.${_pkgarch}
 local _GOAPPS=${GOPATH}/apps.${_pkgarch}
 local GOOS=linux
 export CC=musl-gcc
-  #static cross-compilation
-  #[[ $_pkgarch == "amd64" ]] && local GOARCH=amd64 && local CC=musl-gcc
-  #[[ $_pkgarch == "arm64" ]] && local GOARCH=arm64 && local CC=aarch64-linux-musl-gcc
-  #[[ $_pkgarch == "armhf" ]] && local GOARCH=arm && local GOARM=6 && local CC=arm-linux-gnueabihf-musl-gcc
 
-#_ldflags=('-linkmode external -extldflags "-static" -buildid=')
-
-#${_defaults} ${_goarch}
 #create read only cache binary
 cd ${srcdir}/${_scripts}/skycache
 go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ skycache.go
@@ -101,9 +63,6 @@ _buildbins vpn-server $_GOAPPS apps/
 _buildbins skywire-visor $GOBIN
 _buildbins skywire-cli $GOBIN
 _buildbins setup-node $GOBIN
-#_msg2 'building hypervisor binary'  #hypervisor has been combined with the visor
-#cd ${_cmddir}/hypervisor
-#go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
 
 #binary transparency
 cd $GOBIN
@@ -112,7 +71,7 @@ sha256sum $(ls)
 cd $_GOAPPS
 sha256sum $(ls)
 
-
+### CONTROL FILES CREATION ###
 #create control file for the debian package
 echo "Package: skywire" > ${srcdir}/${_pkgarch}.control
 echo "Version: ${_pkgver}-${_pkgrel}" >> ${srcdir}/${_pkgarch}.control
@@ -146,8 +105,7 @@ echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/${_pkgarch}.skywi
 echo "Description: easy backup and restore skywire configuration" >> ${srcdir}/${_pkgarch}.skywire-save.control
 }
 
-#I had to speed up the build for testing but there's a risk of using old binaries.
-#will change this when the commit for the build tracks a branch
+#speed up the build for testing - there's a risk of using old binaries.
 _buildbins() {
 _GOHERE=$2  #target bin dir
 _binpath=$3   #find the binary here- expecting 'apps/' or empty
@@ -212,15 +170,15 @@ _msg2 'renaming skywire-visor to skywire'
 mv ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}
 
 _msg2 'installing skywire systemd services'
-install -Dm644 ${srcdir}/${_scripts}/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service
-install -Dm644 ${srcdir}/${_scripts}/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service
+install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service
+install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service
 
 _msg2 'installing tls key and certificate generation scripts'
 #install -Dm755 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/generate-1.sh ${pkgdir}/${_skydir}/ssl/generate.sh
-install -Dm755 ${srcdir}/${_scripts}/generate.sh ${_pkgdir}/${_skydir}/ssl/generate.sh
+install -Dm755 ${srcdir}/${_scripts}/ssl/generate.sh ${_pkgdir}/${_skydir}/ssl/generate.sh
 ln -rTsf ${_pkgdir}/${_skydir}/ssl/generate.sh ${_pkgdir}/usr/bin/skywire-tls-gen
-#install -Dm644 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
-install -Dm644 ${srcdir}/${_scripts}/certificate.cnf ${_pkgdir}/${_skydir}/ssl/certificate.cnf
+install -Dm644 ${srcdir}/${_pkgname}/static/skywire-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf
+#install -Dm644 ${srcdir}/${_scripts}/ssl/certificate.cnf ${_pkgdir}/${_skydir}/ssl/certificate.cnf
 
 _msg2 'installing `hypervisorkey` control file and postinst script'
 install -Dm755  ${srcdir}/${_pkgarch}.hypervisorkey.control  ${_pkgdir}/${_skydir}/hypervisorkey/DEBIAN/control