diff options
| author | Gennady Feldman <gena01@gmail.com> | 2016-11-20 04:37:54 +0000 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2016-11-20 12:49:20 +0100 |
| commit | 097521b56d1b5edb5446f878f0b3ae20811092ae (patch) | |
| tree | c57bce8c65b48f793b19689c51fc6e881bd92606 /testing | |
| parent | 2de5f2a4a55ac74eab719cdfec9dd88abed45090 (diff) | |
| download | aports-097521b56d1b5edb5446f878f0b3ae20811092ae.tar.bz2 aports-097521b56d1b5edb5446f878f0b3ae20811092ae.tar.xz | |
testing/consul: upgrade to 0.7.1 and improve abuild
* Updating to latest 0.7.1 release
* Cleaning up APKBUILD (and fixing version)
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/consul/APKBUILD | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/testing/consul/APKBUILD b/testing/consul/APKBUILD index 11f54888ba..96a8b276c8 100644 --- a/testing/consul/APKBUILD +++ b/testing/consul/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Olivier Mauras <olivier@mauras.ch> # Maintainer: pkgname=consul -pkgver=0.7.0 -pkgrel=1 +pkgver=0.7.1 +pkgrel=0 pkgdesc="A tool for service discovery, monitoring and configuration" url="https://www.consul.io/" arch="all !aarch64" @@ -12,7 +12,6 @@ makedepends="go" install="$pkgname.pre-install" pkgusers="consul" pkggroups="consul" -options="!strip" source="$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/$pkgname/archive/v$pkgver.tar.gz consul.initd consul.confd @@ -20,17 +19,20 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/$pkgname/archive/v encrypt.json.sample server.json tls.json.sample" -builddir="$srcdir/$pkgname-$pkgver" +builddir="$srcdir/src/github.com/hashicorp/$pkgname" -build() { - cd "$builddir"/$pkgname || return 1 +prepare() { + mkdir -p "$srcdir/src/github.com/hashicorp" + mv "$srcdir"/$pkgname-$pkgver "$builddir"/ || return 1 + default_prepare +} - mkdir -p "$builddir/src/github.com/hashicorp" - ln -s "$builddir" "$builddir/src/github.com/hashicorp/consul" - cd "$builddir/src/github.com/hashicorp/consul" +build() { + cd "$builddir" - GOPATH="$builddir" go build -v -o bin/consul \ - -ldflags "-X main.GitDescribe=$pkgver" || return 1 + GOPATH="$srcdir" go build -v -o bin/$pkgname \ + -ldflags "-X github.com/hashicorp/consul/version.GitDescribe='${pkgver}'" \ + --tags consul || return 1 } package() { @@ -54,21 +56,21 @@ package() { install -m640 -o root -g consul "$srcdir"/$cf "$pkgdir"/etc/${pkgname} || return 1 done } -md5sums="fd77c4b472db5a3b7be79c71cd6686a3 consul-0.7.0.tar.gz +md5sums="ad398173fd8a8b96d2e16132485c4955 consul-0.7.1.tar.gz 2b5a6c8ef08fe4b31bf812fa1157d2ba consul.initd 9873f8d9a30f788eda9298e89366a1c9 consul.confd 3ecdfa3d217bf8517a2b025da321811d acl.json.sample 3cfcc6f98d15ce3f3ac7021657786ab6 encrypt.json.sample 75a654690d6096987d52796a6e01e405 server.json f16f70961c3297b54affc6f2c615873a tls.json.sample" -sha256sums="d3616f204370aa199df516d792fe0835019aed7b6596aa7f6bdc71c2b1067494 consul-0.7.0.tar.gz +sha256sums="d1498c851df8aa150c7b4398fdbb74467af4949d20ce5b4840b88095fce71135 consul-0.7.1.tar.gz 9f86a7da0b857ffff9e39b8e722285ed481636d4696f7311858c62a843176ad2 consul.initd 888aaaee84b3d8431526960becfdb123eaf438ae10fa58f59b5520ae0c0d0830 consul.confd 40b230f47a5a52eac87cfea4cdda99125a2136630bdf49d22af0df814201f313 acl.json.sample 927f9b480d4593a9d3dfe5e3e047e30fddc954a83157517135db3f60e7596a6f encrypt.json.sample 1058636fbbe66890c8a04a264f1200572202b205976aa562b07fe86f4faab89f server.json b10bd00587a8ed56284e1c0bc9f1bdc6d556986320113ddf4e118042dc39cd2d tls.json.sample" -sha512sums="1073dacbd2c9ceb5bb05f15f173daf8ac8ae215e32eefdb7fec0e5bf2c49cd486bb7d07829da217cf78956ea978d02c03611b74a7fa9d77003c42d1ba392f06f consul-0.7.0.tar.gz +sha512sums="0cc7dfb5b13c9aa5c59f3c74d44c863cb4099108dadc448233edd006bfd1c1ad422c18224d58113bdad1ca6160a89d1a0a04bf1f5e5f645d5499c0c4422d12ba consul-0.7.1.tar.gz b0b6ba59d5b2c07f269bf901a24d1dcfbf96953185582577cecf7e17a2909a98673ec780d107b6264e910425aeadcf21d4adcedb89d4616c4eb9840e08639c17 consul.initd f2c5af74dfcbca2fea8ebea31139d93f44455b93ef17ec611b880d7071af4125615dbbd23969d0d04ca636c26d7b4e7eb97f1266baa89252097f4cbc5173d817 consul.confd d4310dde63d3b8fc4791124bd255bf2a1402b86d00f6b1732e18b0caedb75eae6c77382e1a48f12469828ef4bb363db4580fb1aafa63fcdc97b1431f6ea96d58 acl.json.sample |