diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 109 | ||||
| -rw-r--r-- | skywire-scripts.tar.gz | bin | 7656 -> 7806 bytes |
3 files changed, 46 insertions, 72 deletions
@@ -1,6 +1,6 @@ pkgbase = skywire pkgdesc = Skywire Mainnet Node implementation. Skycoin.com - pkgver = 0.4.0 + pkgver = 0.4.2 pkgrel = 1 url = https://github.com/skycoin/skywire install = skywire.install @@ -19,10 +19,9 @@ pkgbase = skywire makedepends = go makedepends = musl makedepends = kernel-headers-musl - source = git+https://github.com/skycoin/skywire.git + source = https://github.com/skycoin/skywire/archive/refs/tags/v0.4.2.tar.gz source = skywire-scripts.tar.gz - sha256sums = SKIP - sha256sums = 2994b9816389300da84de6880aa531a5eedc4ad2d4da693ee371d0f61ff8a38b + sha256sums = 477a42634b2f979fb9e13448a08dfd5aa325d4d0b72cf787dd7cb86d9f30d64f + sha256sums = fad6c525f267271c94650559bab89a78b6a05419ed7682a143c95b0eb51de658 pkgname = skywire - @@ -6,8 +6,7 @@ _pkgname=${pkgname} _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Skycoin.com" _pkggopath="github.com/${_githuborg}/${_pkgname}" -pkgver=0.4.0 #manually verioning because git describe isnt reflecting the version correctly -#pkgver='autogenerated' +pkgver=0.4.2 pkgrel=1 #pkgrel=1 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) @@ -16,45 +15,17 @@ license=() makedepends=('git' 'go' 'musl' 'kernel-headers-musl') #disable signature check pending fixes# 'skycoin-keyring') install=skywire.install _scripts=${_pkgname}-scripts -#scripts need at least this commit to work if current build to develop fails -#source=("git+${url}.git#commit=d156980280fdb2ddfc8765ff77cdd55c0b7e9d9c" -source=("git+${url}.git" ##branch=${BRANCH:-develop}" -"${_scripts}.tar.gz" ) -#'PKGBUILD.sig' #disable signature checking for now -#'PKGBUILD') -sha256sums=('SKIP' - '2994b9816389300da84de6880aa531a5eedc4ad2d4da693ee371d0f61ff8a38b') -# 'SKIP' -# 'SKIP') -#validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC') # Moses Narrow <moe_narrow@use.startmail.com> -#'98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com> - -#tar -czvf skywire-scripts.tar.gz skywire-scripts -#updpkgsums - -#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 "${_version}_${_date}.${_count}_${_commit}_${BRANCH:-develop}" -#} -#BUILD_OPTS= +source=( +"${url}/archive/refs/tags/v${pkgver}.tar.gz" +"${_scripts}.tar.gz" +) +sha256sums=('477a42634b2f979fb9e13448a08dfd5aa325d4d0b72cf787dd7cb86d9f30d64f' + 'fad6c525f267271c94650559bab89a78b6a05419ed7682a143c95b0eb51de658') prepare() { -#verify PKGBUILD signature -# gpg --verify ${srcdir}/PKGBUILD.sig ${srcdir}/PKGBUILD #disabled the signature check - # https://wiki.archlinux.org/index.php/Go_package_guidelines mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps -ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath} +ln -rTsf ${srcdir}/${pkgname}-${pkgver} ${srcdir}/go/src/${_pkggopath} cd ${srcdir}/go/src/${_pkggopath}/ -#echo " -#version: -# echo "${BUILD_OPTS}" -#" >> Makefile -#BUILD_OPTS=$(make version) } build() { @@ -66,24 +37,45 @@ 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 +cd "${srcdir}/${pkgname}-${pkgver}" +local _version="v0.4.2" + +DMSG_BASE="github.com/skycoin/dmsg" +BUILDINFO_PATH="${DMSG_BASE}/buildinfo" +BUILDINFO_VERSION="${BUILDINFO_PATH}.version=${_version}" +BUILDINFO=${BUILDINFO_VERSION} ${BUILDINFO_DATE} ${BUILDINFO_COMMIT} #create the skywire binaries cd ${srcdir}/go/src/${_pkggopath} _cmddir=${srcdir}/go/src/${_pkggopath}/cmd #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/ -_buildbins vpn-client $_GOAPPS apps/ -_buildbins vpn-server $_GOAPPS apps/ -_buildbins skywire-visor $GOBIN -_buildbins skywire-cli $GOBIN -_buildbins setup-node $GOBIN + +_msg2 "building skychat binary" +cd ${_cmddir}/apps/skychat +go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . +_msg2 "building skysocks binary" +cd ${_cmddir}/apps/skysocks +go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . +_msg2 "building skysocks-client binary" +cd ${_cmddir}/apps/skysocks-client +go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . +_msg2 "building vpn-client binary" +cd ${_cmddir}/apps/vpn-client +go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . +_msg2 "building vpn-server binary" +cd ${_cmddir}/apps/vpn-server +go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $_GOAPPS . +_msg2 "building skywire-cli binary" +cd ${_cmddir}/skywire-cli +go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN . +_msg2 "building skywire-visor binary" +cd ${_cmddir}/skywire-visor +go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN . +_msg2 "building setup-node binary" +cd ${_cmddir}/setup-node +go build -trimpath --ldflags="" --ldflags "${BUILDINFO} -s -w -linkmode external -extldflags '-static' -buildid=" -o $GOBIN . + #binary transparency cd $GOBIN _msg2 'binary sha256sums' @@ -92,18 +84,6 @@ cd $_GOAPPS sha256sum $(ls) } -#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 -_buildbins() { -_GOHERE=$2 -_binpath=$3 -_binname=$1 -_msg2 "building ${_binname} binary" -if [[ ! -f ${_GOHERE}/${_binname} ]] ; then - cd ${_cmddir}/${_binpath}${_binname} - go build -trimpath --ldflags="" --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ . -fi -} package() { @@ -155,10 +135,6 @@ install -Dm755 ${srcdir}/${_scripts}/hypervisorkey/hypervisorkey-autoconfig.sh $ #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) -#install -Dm644 ${srcdir}/go/src/${_pkggopath}/init/${_pkgname}-hypervisor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-hypervisor.service -#install -Dm644 ${srcdir}/go/src/${_pkggopath}/init/${_pkgname}-visor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-visor.service - #install the patched system.d services install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${pkgdir}/${_systemddir}/${_pkgname}.service install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${pkgdir}/${_systemddir}/${_pkgname}-visor.service @@ -167,10 +143,9 @@ install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${pkgdir} install -Dm644 ${srcdir}/${_scripts}/skycache/skycache.service ${pkgdir}/${_systemddir}/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}/ssl/generate.sh ${pkgdir}/${_skydir}/ssl/generate.sh ln -rTsf ${pkgdir}/${_skydir}/ssl/generate.sh ${pkgdir}/usr/bin/${_pkgname}-tls-gen -install -Dm644 ${srcdir}/${_pkgname}/static/${_pkgname}-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf +install -Dm644 ${srcdir}/${_pkgname}-${pkgver}/static/${_pkgname}-manager-src/ssl/certificate.cnf ${pkgdir}/${_skydir}/ssl/certificate.cnf } _install2() { diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz Binary files differindex b605e013eabb..bc92d1bd6955 100644 --- a/skywire-scripts.tar.gz +++ b/skywire-scripts.tar.gz |