diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-09-25 05:50:04 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-09-25 05:50:04 +0000 |
| commit | a76acc4ca38a733683693e9ac73dceba03dd52fd (patch) | |
| tree | ff9c2d88363bbdb7ff5b1f6bda03b39e17e8e680 /main | |
| parent | 198256f6755f794375b5f1b4dc9aa3b3a0a377c2 (diff) | |
| download | aports-a76acc4ca38a733683693e9ac73dceba03dd52fd.tar.bz2 aports-a76acc4ca38a733683693e9ac73dceba03dd52fd.tar.xz | |
main/redis: modernize, add check
Diffstat (limited to 'main')
| -rw-r--r-- | main/redis/APKBUILD | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD index 5c9d14b11d..705c5a7c18 100644 --- a/main/redis/APKBUILD +++ b/main/redis/APKBUILD @@ -9,6 +9,7 @@ arch="all" license="BSD" depends="" makedepends="linux-headers" +checkdepends="tcl" install="redis.pre-install" pkgusers="redis" pkggroups="redis" @@ -20,7 +21,7 @@ source="http://download.redis.io/releases/$pkgname-$pkgver.tar.gz builddir="$srcdir/$pkgname-$pkgver" prepare() { - default_prepare || return 1 + default_prepare cd "$builddir" sed -i -e 's|^daemonize .*|daemonize yes|' \ @@ -28,7 +29,15 @@ prepare() { -e 's|^logfile .*|logfile /var/log/redis/redis\.log|' \ -e 's|^pidfile .*|pidfile /var/run/redis/redis\.pid|' \ -e 's|^loglevel .*|loglevel notice|' \ - redis.conf || return 1 + redis.conf + + # disable broken tests + # 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' \ + tests/test_helper.tcl } build() { @@ -36,7 +45,12 @@ build() { make PREFIX=/usr \ INSTALL_BIN="$pkgdir"/usr/bin \ MALLOC=libc \ - all || return 1 + all +} + +check() { + cd "$builddir" + make test } package() { @@ -45,23 +59,20 @@ package() { install -d -o redis -g redis \ "$pkgdir"/var/lib/redis \ "$pkgdir"/var/log/redis \ - "$pkgdir"/var/run/redis \ - || return 1 + "$pkgdir"/var/run/redis install -D -m755 "$builddir/COPYING" \ - "$pkgdir/usr/share/licenses/redis/COPYING" || return 1 + "$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" \ - || return 1 - install -D -m644 "$builddir/redis.conf" "$pkgdir/etc/redis.conf" \ - || retrun 1 + "$pkgdir/etc/conf.d/redis" + install -D -m644 "$builddir/redis.conf" "$pkgdir/etc/redis.conf" make PREFIX=/usr \ INSTALL_BIN="$pkgdir/usr/bin" \ - install || return 1 + install } sha512sums="1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4 redis-4.0.2.tar.gz |