diff options
| author | Henrik Riomar <henrik.riomar@gmail.com> | 2017-09-26 08:39:04 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-09-26 10:48:42 +0000 |
| commit | c339e62eaf963dfdabd32300bc9db379374eb684 (patch) | |
| tree | e0fe82c418d131a59dc282ea8aadf25d207fa118 | |
| parent | 3c3b46eb51effd62a2821e1239fab2ed09eee1f8 (diff) | |
| download | aports-c339e62eaf963dfdabd32300bc9db379374eb684.tar.bz2 aports-c339e62eaf963dfdabd32300bc9db379374eb684.tar.xz | |
testing/netdata: upgrade to 1.8
Add check(), drop prepare().
While at it change to ::noarch for subpackages (instead of arch="noarch")
| -rw-r--r-- | testing/netdata/APKBUILD | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/testing/netdata/APKBUILD b/testing/netdata/APKBUILD index 3f1d658d8d..74a8a69156 100644 --- a/testing/netdata/APKBUILD +++ b/testing/netdata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=netdata -pkgver=1.6.0 +pkgver=1.8.0 pkgrel=0 pkgdesc="Real-time performance monitoring" url="https://github.com/firehol/netdata" @@ -11,17 +11,12 @@ depends="bash" makedepends="zlib-dev e2fsprogs-dev" pkgusers="netdata" pkggroups="netdata" -subpackages="$pkgname-nodejs $pkgname-python" +subpackages="$pkgname-nodejs::noarch $pkgname-python::noarch" install="$pkgname.pre-install" source="https://github.com/firehol/netdata/releases/download/v$pkgver/netdata-$pkgver.tar.xz $pkgname.initd" builddir="$srcdir"/$pkgname-$pkgver -prepare() { - default_prepare - update_config_guess -} - build() { cd "$builddir" ./configure \ @@ -31,18 +26,24 @@ build() { --with-zlib \ --with-math \ --with-webdir=/usr/share/webapss/netdata \ - --with-user=netdata || return 1 - make || return 1 + --with-user=netdata + make +} + +check() { + cd "$builddir" + make check } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 - chgrp -R $pkggroups "$pkgdir"/usr/share/webapss/netdata || return 1 + make DESTDIR="$pkgdir" install + chgrp -R $pkggroups "$pkgdir"/usr/share/webapss/netdata chown -R $pkgusers:$pkggroups $pkgdir/var/lib/netdata \ - $pkgdir/var/cache/netdata || return 1 + $pkgdir/var/cache/netdata install -Dm755 $srcdir/$pkgname.initd \ - $pkgdir/etc/init.d/$pkgname || return 1 + $pkgdir/etc/init.d/$pkgname + install -Dm644 ./system/netdata.conf $pkgdir/etc/netdata/netdata.conf } nodejs() { @@ -50,7 +51,7 @@ nodejs() { depends="$pkgname nodejs" mkdir -p "$subpkgdir"/usr/libexec/netdata mv $pkgdir/usr/libexec/netdata/node.d \ - $subpkgdir/usr/libexec/netdata || return 1 + $subpkgdir/usr/libexec/netdata } python() { @@ -58,8 +59,8 @@ python() { depends="$pkgname python2" mkdir -p "$subpkgdir"/usr/libexec/netdata mv $pkgdir/usr/libexec/netdata/python.d \ - "$subpkgdir"/usr/libexec/netdata || return 1 + "$subpkgdir"/usr/libexec/netdata } -sha512sums="e091c2b3a619f62c209d2de8389bc33f98159071730344b17b66a766a3dcf2f598c95f10dbaf1421e32a468f18c975373291e3909002e9bf21dea9939559e1fc netdata-1.6.0.tar.xz +sha512sums="0fb86b6cea9628556b625d9c5930c36b658d997bc477d468341675dfc2f55fe384344758a6efc50c30d502cf3be35fef21b7e320853c96d0b0eaeaafe24e816b netdata-1.8.0.tar.xz 2aaaee7010c24b3f52be8b01295f73ac6c38ac4d1b627e8b9227d03fe3b248b7157b1d5217edebd88ba461adc1ce89503520acd877b300e4503e75125f40da96 netdata.initd" |