diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | deb.PKGBUILD | 2 | ||||
| -rw-r--r-- | skywire-deb-scripts.tar.gz | bin | 3778 -> 3763 bytes | |||
| -rw-r--r-- | skywire-scripts.tar.gz | bin | 5240 -> 5636 bytes |
5 files changed, 16 insertions, 17 deletions
@@ -4,14 +4,17 @@ pkgbase = skywire pkgrel = 4 url = https://github.com/skycoin/skywire install = skywire.install + arch = i686 arch = x86_64 - arch = i386 arch = aarch64 + arch = armv8 + arch = armv7 + arch = armv7l arch = armv7h - arch = arm arch = armv6h arch = armhf arch = armel + arch = arm makedepends = git makedepends = go makedepends = musl @@ -20,7 +23,7 @@ pkgbase = skywire source = git+https://github.com/skycoin/skywire.git source = skywire-scripts.tar.gz sha256sums = SKIP - sha256sums = 187cf780da4d892a7eb940aa4a925e0cc83b0e8de0b255f07f7dafd8f2c854c6 + sha256sums = ce17b7e4cb3620c292172e67229919ad57b943c6756a43acc23a3777cb40ecc0 pkgname = skywire @@ -14,7 +14,6 @@ arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'arm url="https://${_pkggopath}" license=() makedepends=('git' 'go' 'musl' 'kernel-headers-musl') #disable signature check pending fixes# 'skycoin-keyring') -optdepends=('readonly-cache: distribute hypervisorkey package for cluster management') install=skywire.install _scripts=${_pkgname}-scripts #scripts need at least this commit to work if current build to develop fails @@ -24,7 +23,7 @@ source=("git+${url}.git" ##branch=${BRANCH:-develop}" #'PKGBUILD.sig' #disable signature checking for now #'PKGBUILD') sha256sums=('SKIP' - '187cf780da4d892a7eb940aa4a925e0cc83b0e8de0b255f07f7dafd8f2c854c6') + 'ce17b7e4cb3620c292172e67229919ad57b943c6756a43acc23a3777cb40ecc0') # 'SKIP' # 'SKIP') #validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC') # Moses Narrow <moe_narrow@use.startmail.com> @@ -59,12 +58,15 @@ build() { export GOPATH=${srcdir}/go export GOBIN=${GOPATH}/bin export _GOAPPS=${GOPATH}/apps -cd ${srcdir}/go/src/${_pkggopath} export GOOS=linux export CGO_ENABLED=1 #use musl-gcc for static compilation export CC=musl-gcc +_msg2 "building skycache binary" +cd ${srcdir}/${_scripts}/ +go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ skycache.go + #create the skywire binaries cd ${srcdir}/go/src/${_pkggopath} _cmddir=${srcdir}/go/src/${_pkggopath}/cmd @@ -118,11 +120,9 @@ mkdir -p ${pkgdir}/${_skydir}/dmsgpty mkdir -p ${pkgdir}/${_skydir}/${_pkgname} mkdir -p ${pkgdir}/${_skydir}/${_pkgname}-save mkdir -p ${pkgdir}/${_skydir}/transport_logs -mkdir -p ${pkgdir}/${_skydir}/sky-local +mkdir -p ${pkgdir}/${_skydir}/skycache mkdir -p ${pkgdir}/${_skydir}/hypervisorkey - - _msg2 'installing binaries' _skywirebins=$( ls ${srcdir}/go/bin ) for i in ${_skywirebins}; do @@ -166,6 +166,9 @@ mv ${pkgdir}/usr/bin/${_pkgname}-visor ${pkgdir}/usr/bin/${_pkgname} install -Dm644 ${srcdir}/${_scripts}/${_pkgname}.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}.service install -Dm644 ${srcdir}/${_scripts}/${_pkgname}-visor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-visor.service +#install the skycache systemd service +install -Dm644 ${srcdir}/${_scripts}/skycache.service ${pkgdir}/usr/lib/systemd/system/skycache.service + #tls key and certificate generation #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 @@ -179,10 +182,3 @@ _msg2() { local mesg=$1; shift printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" } - - -#chck() { -#check -#_msg2 'testing `skywire-cli visor gen-config --help`' -#${pkgdir}/opt/skywire/bin/skywire-cli visor gen-config --help -#} diff --git a/deb.PKGBUILD b/deb.PKGBUILD index 7ff655c90892..6c56d3fca3a3 100644 --- a/deb.PKGBUILD +++ b/deb.PKGBUILD @@ -38,7 +38,7 @@ source=("git+${url}.git#commit=d156980280fdb2ddfc8765ff77cdd55c0b7e9d9c" #'deb.PKGBUILD.sig' #skip the pgp checks for now as makepkg and yay handle it differently #'deb.PKGBUILD') sha256sums=('SKIP' - '05b26d1df4a7dde122f7b848b617ab65c8e1bf16a8a87f010f5aa1e4a5956b84') + '1e76ca2600fcbc5aad699aadf113589d8e7679907ad0b5f386fd30f2e44043fc') # 'SKIP' # 'SKIP') #validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC') # Moses Narrow <moe_narrow@use.startmail.com> diff --git a/skywire-deb-scripts.tar.gz b/skywire-deb-scripts.tar.gz Binary files differindex 96483974231f..a30e19b23267 100644 --- a/skywire-deb-scripts.tar.gz +++ b/skywire-deb-scripts.tar.gz diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz Binary files differindex e4ae28ab839d..144943a0ceb1 100644 --- a/skywire-scripts.tar.gz +++ b/skywire-scripts.tar.gz |