make binaries smaller; add compression for the deb.PKGBUILD

3 files changed, 9 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82276acbf61e..cf82db34c8fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
 	pkgver = 0.3.0
-	pkgrel = 5
+	pkgrel = 7
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -19,7 +19,7 @@ pkgbase = skywire
 	makedepends = go
 	makedepends = musl
 	makedepends = kernel-headers-musl
-	source = git+https://github.com/skycoin/skywire.git
+	source = git+https://github.com/skycoin/skywire.git##branch=develop
 	source = skywire-scripts.tar.gz
 	sha256sums = SKIP
 	sha256sums = f51b642a4ea57b2eed4aeab75577d041aceb4e277c36a2f8de64c6d367f15d84
diff --git a/PKGBUILD b/PKGBUILD
index ff7cdb20fc0f..0ccf5319c463 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 pkgver=0.3.0
 #pkgver='autogenerated'
-pkgrel=5
-#pkgrel=5
+pkgrel=7
+#pkgrel=7
 arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
 url="https://${_pkggopath}"
 license=()
@@ -18,7 +18,7 @@ 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}"
+source=("git+${url}.git##branch=${BRANCH:-develop}"
 "${_scripts}.tar.gz"  )
 #'PKGBUILD.sig' #disable signature checking for now
 #'PKGBUILD')
@@ -65,7 +65,7 @@ export CC=musl-gcc
 
 _msg2 "building skycache binary"
 cd ${srcdir}/${_scripts}/
-go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ skycache.go
+go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ skycache.go
 
 #create the skywire binaries
 cd ${srcdir}/go/src/${_pkggopath}
@@ -100,7 +100,7 @@ _binname=$1
 _msg2 "building ${_binname} binary"
 if [[ ! -f ${_GOHERE}/${_binname} ]] ; then
 	cd ${_cmddir}/${_binpath}${_binname}
-  go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ .
+  go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ .
 fi
 }
 
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index 10fc3aef320f..e7bbc4e84618 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -143,7 +143,6 @@ echo "Architecture: ${_pkgarch}" >> ${srcdir}/${_pkgarch}.skywire-save.control
 echo "Depends: ${_pkgname}" >> ${srcdir}/${_pkgarch}.skywire-save.control
 echo "Maintainer: github.com/the-skycoin-project" >> ${srcdir}/${_pkgarch}.skywire-save.control
 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.
@@ -155,7 +154,7 @@ _binname=$1 #which binary to build
 _msg2 "building ${_binname} binary"
 if [[ ! -f ${_GOHERE}/${_binname} ]] ; then #don't waste time rebuilding existing bins
 	cd ${_cmddir}/${_binpath}${_binname}
-  go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ .
+  go build -trimpath --ldflags '-s -w -linkmode external -extldflags "-static" -buildid=' -o $_GOHERE/ .
 fi
 }
 
@@ -234,12 +233,9 @@ install -Dm755  ${srcdir}/${_scripts}/skywire-save.postinst  ${_pkgdir}/${_skydi
 install -Dm755  ${srcdir}/${_scripts}/skywire-save.postrm  ${_pkgdir}/${_skydir}/skywire-save/DEBIAN/postrm
 install -Dm755  ${srcdir}/${_scripts}/skywire-save.sh  ${_pkgdir}/usr/bin/skywire-save
 
-
-
 _msg2 'installing skycache systemd services'
 install -Dm644 ${srcdir}/${_scripts}/skycache.service ${_pkgdir}/${_systemddir}/skycache.service
 
-
 _msg2 'installing skywire control file, postinst & postrm scripts'
 install -Dm755 ${srcdir}/${_pkgarch}.control ${_pkgdir}/DEBIAN/control
 install -Dm755 ${srcdir}/${_scripts}/postinst.sh ${_pkgdir}/DEBIAN/postinst
@@ -248,7 +244,7 @@ install -Dm755 ${srcdir}/${_scripts}/postrm.sh ${_pkgdir}/DEBIAN/postrm
 _msg2 'creating the debian package'
 #create the debian package
 cd $pkgdir
-dpkg-deb --build ${_debpkgdir}
+dpkg-deb --build -z9 ${_debpkgdir}
 mv *.deb ../../
 #exit so the arch package doesn't get built
 exit