diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-15 23:55:49 +0200 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2018-05-16 00:29:44 +0200 |
commit | 9eb6b73c74302111d40228d99cc9ee789b226497 (patch) | |
tree | 2dc047c19b089e50dcf34423b3790dc5058035a6 /main | |
parent | 06680fec22e6d6f6340205fd65bcb2fed34d97f0 (diff) | |
download | aports-9eb6b73c74302111d40228d99cc9ee789b226497.tar.bz2 aports-9eb6b73c74302111d40228d99cc9ee789b226497.tar.xz |
main/redis: improve abuild
Diffstat (limited to 'main')
-rw-r--r-- | main/redis/APKBUILD | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD index c3776c9ae1..dfb221f207 100644 --- a/main/redis/APKBUILD +++ b/main/redis/APKBUILD @@ -9,16 +9,15 @@ arch="all" license="BSD-3-Clause" pkgusers="redis" pkggroups="redis" -depends="" makedepends="linux-headers" checkdepends="tcl procps" -install="redis.pre-install" +install="$pkgname.pre-install" subpackages="$pkgname-openrc" source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz redis.conf.patch - redis.initd - redis.logrotate - redis.confd + $pkgname.initd + $pkgname.logrotate + $pkgname.confd " builddir="$srcdir/$pkgname-$pkgver" @@ -30,7 +29,7 @@ prepare() { # see: https://github.com/antirez/redis/issues/2814 # https://github.com/antirez/redis/issues/3810 sed -i -e '/integration\/aof/d' \ - -e '/integration\/logging/d' \ + -e '/integration\/logging/d' \ tests/test_helper.tcl } @@ -49,23 +48,20 @@ check() { package() { cd "$builddir" - mkdir -p "$pkgdir"/usr/bin - install -d -o redis -g redis \ - "$pkgdir"/var/lib/redis \ - "$pkgdir"/var/log/redis \ - install -D -m755 "$builddir/COPYING" \ - "$pkgdir/usr/share/licenses/redis/COPYING" - install -D -m755 "$srcdir/redis.initd" "$pkgdir/etc/init.d/redis" \ - && install -Dm644 "$srcdir/redis.logrotate" \ - "$pkgdir/etc/logrotate.d/redis" \ - && install -Dm644 "$srcdir/redis.confd" \ - "$pkgdir/etc/conf.d/redis" - install -D -m644 "$builddir/redis.conf" "$pkgdir/etc/redis.conf" + make install PREFIX=/usr INSTALL_BIN="$pkgdir/usr/bin" - make PREFIX=/usr \ - INSTALL_BIN="$pkgdir/usr/bin" \ - install + cd "$pkgdir" + + install -D -m 644 "$builddir"/redis.conf etc/redis.conf + + install -D -m 755 "$srcdir"/redis.initd etc/init.d/redis + install -D -m 644 "$srcdir"/redis.confd etc/conf.d/redis + install -D -m 644 "$srcdir"/redis.logrotate etc/logrotate.d/redis + + install -d -o redis -g redis \ + var/lib/redis \ + var/log/redis } sha512sums="a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598 redis-4.0.9.tar.gz |