summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD42
-rw-r--r--cc.deb.PKGBUILD64
-rw-r--r--deb.PKGBUILD68
4 files changed, 60 insertions, 118 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fffca0d82f07..4c6fa2f0c9db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = skywire
pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
- pkgver = 0.3.0
- pkgrel = 12
+ pkgver = 0.4.0
+ pkgrel = 1
url = https://github.com/skycoin/skywire
install = skywire.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 7fad8ff8c51a..07b66647372f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@ _pkgname=${pkgname}
_githuborg=${_projectname}
pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
_pkggopath="github.com/${_githuborg}/${_pkgname}"
-pkgver=0.3.0
+pkgver=0.4.0 #manually verioning because git describe isnt reflecting the version correctly
#pkgver='autogenerated'
-pkgrel=12
-#pkgrel=12
+pkgrel=1
+#pkgrel=1
arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
url="https://${_pkggopath}"
license=()
@@ -41,7 +41,7 @@ sha256sums=('SKIP'
#local _commit=$(git rev-parse --short HEAD)
#echo "${_version}_${_date}.${_count}_${_commit}_${BRANCH:-develop}"
#}
-
+#BUILD_OPTS=
prepare() {
#verify PKGBUILD signature
# gpg --verify ${srcdir}/PKGBUILD.sig ${srcdir}/PKGBUILD #disabled the signature check
@@ -50,9 +50,11 @@ prepare() {
mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps
ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath}
cd ${srcdir}/go/src/${_pkggopath}/
-#avoid develop branch build failures on ARM
-#[[ $CARCH == "x86_64" ]] && git checkout develop || git checkout d156980280fdb2ddfc8765ff77cdd55c0b7e9d9c
-git checkout d156980280fdb2ddfc8765ff77cdd55c0b7e9d9c
+#echo "
+#version:
+# echo "${BUILD_OPTS}"
+#" >> Makefile
+#BUILD_OPTS=$(make version)
}
build() {
@@ -60,10 +62,11 @@ export GOPATH=${srcdir}/go
export GOBIN=${GOPATH}/bin
export _GOAPPS=${GOPATH}/apps
export GOOS=linux
-export CGO_ENABLED=1
+export CGO_ENABLED=1 #default anyways
#use musl-gcc for static compilation
export CC=musl-gcc
+#build the golang webserver binary for hosting local package repo
_msg2 "building skycache binary"
cd ${srcdir}/${_scripts}/skycache
go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ skycache.go
@@ -71,8 +74,8 @@ go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -bu
#create the skywire binaries
cd ${srcdir}/go/src/${_pkggopath}
_cmddir=${srcdir}/go/src/${_pkggopath}/cmd
-#static compilation ; need to re-evaluate build determinism
-
+#static compilation with 'musl' avoids glibc runtime deps
+#which cause binary to fail if correct glibc / libc6 is not found on the system
_buildbins skychat $_GOAPPS apps/
_buildbins skysocks $_GOAPPS apps/
_buildbins skysocks-client $_GOAPPS apps/
@@ -81,9 +84,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
_msg2 'binary sha256sums'
@@ -101,12 +101,13 @@ _binname=$1
_msg2 "building ${_binname} binary"
if [[ ! -f ${_GOHERE}/${_binname} ]] ; then
cd ${_cmddir}/${_binpath}${_binname}
- go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ .
+ go build -trimpath --ldflags="" --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ .
fi
}
package() {
+ _msg2 'creating dirs'
#create directory trees or the visor might make them with weird permissions
_skydir="opt/skywire"
_skyapps="${_skydir}/apps"
@@ -141,17 +142,17 @@ _skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} )
for i in ${_skywirescripts}; do
_install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts}
done
-
+#the main scripts get installed above, the following are satellite-package or haveto do with the tls config - WIP
install -Dm755 ${srcdir}/${_scripts}/skywire-save/${_pkgname}-save.PKGBUILD ${pkgdir}/${_skydir}/${_pkgname}-save/PKGBUILD
install -Dm755 ${srcdir}/${_scripts}/skywire-save/${_pkgname}-save.install ${pkgdir}/${_skydir}/${_pkgname}-save/${_pkgname}-save.install
install -Dm644 ${srcdir}/${_scripts}/skywire-save/${_pkgname}-save.txt ${pkgdir}/${_skydir}/${_pkgname}-save/${_pkgname}-save.install
-#install the satellite PKGBUILD for distributing the hypervisor key and it's script
+#install the satellite PKGBUILD for distributing the hypervisor key and it's script - works with skycache to share the packages
install -Dm755 ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey.PKGBUILD ${pkgdir}/${_skydir}/hypervisorkey/PKGBUILD
install -Dm755 ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey.install ${pkgdir}/${_skydir}/hypervisorkey/hypervisorkey.install
install -Dm755 ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey-autoconfig.sh ${pkgdir}/${_skydir}/hypervisorkey/hypervisorkey-autoconfig.sh
-#rename visor to skywire
+#rename visor to skywire - matche the skycoin / skycoin-cli of the skycoin wallet
[[ -f ${pkgdir}/usr/bin/${_pkgname}-visor ]] && mv ${pkgdir}/usr/bin/${_pkgname}-visor ${pkgdir}/usr/bin/${_pkgname}
#install the system.d services (from the source)
@@ -178,7 +179,6 @@ _binname="${_binname%%.*}"
install -Dm755 ${1} ${pkgdir}/${2}/${_binname}
ln -rTsf ${pkgdir}/${2}/${_binname} ${pkgdir}/usr/bin/${_binname}
chmod +x ${pkgdir}/usr/bin/${_binname}
-
}
_msg2() {
@@ -186,3 +186,9 @@ _msg2() {
local mesg=$1; shift
printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
}
+
+_msg3() {
+(( QUIET )) && return
+local mesg=$1; shift
+printf "${BLUE} -->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@"
+}
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
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