diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | git.PKGBUILD | 29 | ||||
| -rw-r--r-- | skywire-scripts.tar.gz | bin | 9853 -> 11163 bytes |
4 files changed, 19 insertions, 14 deletions
@@ -22,6 +22,6 @@ pkgbase = skywire source = https://github.com/skycoin/skywire/archive/refs/tags/v0.6.0.tar.gz source = skywire-scripts.tar.gz sha256sums = f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3 - sha256sums = 967306a134398efb8dfaee45e0bded285e15490f480e6a8ed74438d70320eea5 + sha256sums = 98a74485ec33c4d3b44ecdfb041bfb3f31636a176c9baa78d805a9056e604f0d pkgname = skywire @@ -19,7 +19,7 @@ source=("${url}/archive/refs/tags/v${pkgver}.tar.gz" "${_scripts}.tar.gz" ) sha256sums=('f1c6ae2dbe36cda0767855ac1b8676751358ca782e2c3d8ee16ba9b0de9b2bc3' - '967306a134398efb8dfaee45e0bded285e15490f480e6a8ed74438d70320eea5') + '98a74485ec33c4d3b44ecdfb041bfb3f31636a176c9baa78d805a9056e604f0d') prepare() { # https://wiki.archlinux.org/index.php/Go_package_guidelines mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps diff --git a/git.PKGBUILD b/git.PKGBUILD index 488a17132afd..d440a7515ac0 100644 --- a/git.PKGBUILD +++ b/git.PKGBUILD @@ -7,19 +7,19 @@ _githuborg=${_projectname} pkgdesc="Skywire Mainnet Node implementation. Skycoin.com" _pkggopath="github.com/${_githuborg}/${_pkgname}" pkgver='autogenerated' -pkgrel=3 +pkgrel=1 #pkgrel=3 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' ) url="https://${_pkggopath}" license=() -makedepends=('git' 'go' 'musl' 'kernel-headers-musl') #disable signature check pending fixes# 'skycoin-keyring') +makedepends=('git' 'go' 'musl' 'kernel-headers-musl' 'libappindicator-gtk3' 'gtk3') install=skywire.install _scripts=${_pkgname}-scripts source=("git+${url}.git#branch=develop" "${_scripts}.tar.gz" ) sha256sums=('SKIP' - '967306a134398efb8dfaee45e0bded285e15490f480e6a8ed74438d70320eea5') + '98a74485ec33c4d3b44ecdfb041bfb3f31636a176c9baa78d805a9056e604f0d') pkgver() { cd ${srcdir}/${_pkgname} @@ -31,7 +31,7 @@ echo ${_version//v/} prepare() { # 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} ${srcdir}/go/src/${_pkggopath} cd ${srcdir}/go/src/${_pkggopath}/ } @@ -67,16 +67,16 @@ 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 . +go build -tags systray -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 . +go build -tags systray -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 . +go build -tags systray -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 . +go build -tags systray -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 . @@ -125,21 +125,26 @@ chmod +x ${_pkgdir}/usr/bin/* [[ -f ${_pkgdir}/usr/bin/${_pkgname}-visor ]] && ln -rTsf ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname} _msg2 'installing dmsghttp-config.json' -install -Dm644 ${srcdir}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json +install -Dm644 ${srcdir}/${_pkgname}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json _msg2 'installing skywire systemd 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 _msg2 'installing desktop files and icon' -install -Dm644 "${srcdir}"/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop -install -Dm644 "${srcdir}"/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png +install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop +install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png +mkdir -p ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/ ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png - +###STAGING AREA### #Install the correct autocofig script rm ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/.${_pkgname}-autoconfig-git.sh ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig ln -rTsf ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig ${_pkgdir}/usr/bin/${_pkgname}-autoconfig +#Install the updated systemd 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 +install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}-user.service ${_pkgdir}/${_systemddir}/${_pkgname}-user.service } _install2() { diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz Binary files differindex 347b707c7aaa..4411975a38ab 100644 --- a/skywire-scripts.tar.gz +++ b/skywire-scripts.tar.gz |