From 1b07686fb6c931d950ff69d681c1e94aa33811e2 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Sat, 9 Jul 2022 14:00:50 +0700 Subject: 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. --- .SRCINFO | 1 + PKGBUILD | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 06f4e1a..e40f8f6 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 d5082f1..70ea933 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}/ } -- cgit v1.3