update to 0.4.0

1 files changed, 21 insertions, 43 deletions

diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index 7a720afcd89d..a32a786cfc23 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -8,41 +8,29 @@ pkgdesc="Skywire Mainnet Node implementation. Develop Banch. Debian package"
 #set to native architecture with dpkg
 _pkgarch=$(dpkg --print-architecture)
 _pkgarches=('armhf' 'arm64' 'amd64')
-#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}"
 license=()
 #make deps for every architecture are included here..
-makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') #'aarch64-linux-musl' 'arm-linux-gnueabihf-musl' 'skycoin-keyring')
+makedepends=('dpkg' 'git' 'go' 'musl' 'kernel-headers-musl' 'aarch64-linux-musl' 'arm-linux-gnueabihf-musl') # 'arm-linux-gnueabihf-binutils' 'aarch64-binutils') #'aarch64-linux-musl' 'arm-linux-gnueabihf-musl' 'skycoin-keyring')
 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'
             'f993e28400f72a05500f0b091d6d308c5a4a1299a2490ff0ecb5b59b0805e5b1')
-#            'SKIP'
-#            'SKIP')
-#validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
 
 #tar -czvf skywire-deb-scripts.tar.gz skywire-deb-scripts
 #updpkgsums deb.PKGBUILD
@@ -52,25 +40,18 @@ prepare() {
   for i in ${_pkgarches[@]}; do
   _msg2 "$i"
 done
-#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.${_pkgarches[@]} ${srcdir}/go/apps.${_pkgarches[@]}
   ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath}
   cd ${srcdir}/go/src/${_pkggopath}/
-
-  #[[ $CARCH == "x86_64" ]] && git checkout develop || git checkout d156980280fdb2ddfc8765ff77cdd55c0b7e9d9c
-   git checkout d156980280fdb2ddfc8765ff77cdd55c0b7e9d9c
 }
 
 build() {
   local GOPATH=${srcdir}/go
   export GOOS=linux
   export CGO_ENABLED=1
-  #export CC=musl-gcc
-  #static cross-compilation
+
   for i in ${_pkgarches[@]}; do
     msg2 "_pkgarch=$i"
     local _pkgarch=$i
@@ -78,7 +59,6 @@ build() {
     export GOBIN=${GOPATH}/bin.${_pkgarch}
     export _GOAPPS=${GOPATH}/apps.${_pkgarch}
     export GOOS=linux
-    #export CC=musl-gcc
     #static cross-compilation
     [[ $_pkgarch == "amd64" ]] && export GOARCH=amd64 && export CC=musl-gcc
     [[ $_pkgarch == "arm64" ]] && export GOARCH=arm64 && export CC=aarch64-linux-musl-gcc
@@ -90,7 +70,9 @@ build() {
     #create read only cache binary
     #go build -trimpath -o $GOBIN/ ${srcdir}/${_scripts}/skycache.go
     cd ${srcdir}/${_scripts}/skycache
+    _msg2 'building skycache binary'
     go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ skycache.go
+    go build -trimpath --ldflags '-s -w -buildid=' -o $GOBIN/ skycache.go
 
     #create the skywire binaries
     cd ${srcdir}/go/src/${_pkggopath}
@@ -104,9 +86,6 @@ build() {
     _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
@@ -151,8 +130,7 @@ build() {
   done
 }
 
-#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
+#had to 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
@@ -220,29 +198,29 @@ _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
-install -Dm755  ${srcdir}/${_scripts}/hypervisorkey.postinst  ${_pkgdir}/${_skydir}/hypervisorkey/DEBIAN/postinst
-install -Dm755  ${srcdir}/${_scripts}/hypervisorkey.postrm  ${_pkgdir}/${_skydir}/hypervisorkey/DEBIAN/postrm
-install -Dm755  ${srcdir}/${_scripts}/hypervisorkey-autoconfig.sh  ${_pkgdir}/usr/bin/hypervisorkey-autoconfig
+install -Dm755  ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey.postinst  ${_pkgdir}/${_skydir}/hypervisorkey/DEBIAN/postinst
+install -Dm755  ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey.postrm  ${_pkgdir}/${_skydir}/hypervisorkey/DEBIAN/postrm
+install -Dm755  ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey-autoconfig.sh  ${_pkgdir}/usr/bin/hypervisorkey-autoconfig
 
 _msg2 'installing `skywire-save` control file and postinst postrm and script'
 install -Dm755  ${srcdir}/${_pkgarch}.skywire-save.control  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/control
-install -Dm755  ${srcdir}/${_scripts}/skywire-save.postinst  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/postinst
-install -Dm755  ${srcdir}/${_scripts}/skywire-save.postrm  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/postrm
+install -Dm755  ${srcdir}/${_scripts}/skywire-save/skywire-save.postinst  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/postinst
+install -Dm755  ${srcdir}/${_scripts}/skywire-save/skywire-save.postrm  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/postrm
 
 _msg2 'installing skycache systemd services'
-install -Dm644 ${srcdir}/${_scripts}/skycache.service ${_pkgdir}/${_systemddir}/skycache.service
+install -Dm644 ${srcdir}/${_scripts}/skycache/skycache.service ${_pkgdir}/${_systemddir}/skycache.service
 
 _msg2 'installing skywire control file, postinst & postrm scripts'
 install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control