all: simplify packaging by using the staging (_destdir) area

Instead of uncompressing the final build output file (from build.sh),
we sync the staging to $pkgdir.
This require adding rsync to makedeps.

While at it, use single chown statement for all $pkgdir.

2 files changed, 6 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 06f4e1a1f1a9..e40f8f64d885 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = google-cloud-ops-agent-git
 	makedepends = git
 	makedepends = java-environment
 	makedepends = pkg-config
+	makedepends = rsync
 	makedepends = unzip
 	makedepends = zip
 	depends = libyaml
diff --git a/PKGBUILD b/PKGBUILD
index d5082f1ec410..70ea9336e8aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,6 +19,7 @@ makedepends=(
 	'git'
 	'java-environment'
 	'pkg-config'
+	'rsync'
 	'unzip'
 	'zip'
 )
@@ -79,10 +80,10 @@ build() {
 }
 
 package() {
+	_destdir="$srcdir/../staging"
+
 	cd "${pkgname}"
-	tar -xf /tmp/google-cloud-ops-agent.tgz -C ${pkgdir}/
+	rsync -ar "${_destdir}/" "${pkgdir}/"
 	rm -rf ${pkgdir}/lib
-	chown -R root:root ${pkgdir}/etc
-	chown -R root:root ${pkgdir}/opt
-	chown -R root:root ${pkgdir}/usr
+	chown -R root:root ${pkgdir}/
 }