Date: Saturday, January 14, 2017 @ 17:17:14 Author: seblu Revision: 207357
archrelease: copy trunk to community-x86_64, community-i686 Added: grafana/repos/community-i686/PKGBUILD (from rev 207356, grafana/trunk/PKGBUILD) grafana/repos/community-i686/grafana.install (from rev 207356, grafana/trunk/grafana.install) grafana/repos/community-i686/grafana.service (from rev 207356, grafana/trunk/grafana.service) grafana/repos/community-i686/grafana.sysusers (from rev 207356, grafana/trunk/grafana.sysusers) grafana/repos/community-i686/grafana.tmpfiles (from rev 207356, grafana/trunk/grafana.tmpfiles) grafana/repos/community-x86_64/PKGBUILD (from rev 207356, grafana/trunk/PKGBUILD) grafana/repos/community-x86_64/grafana.install (from rev 207356, grafana/trunk/grafana.install) grafana/repos/community-x86_64/grafana.service (from rev 207356, grafana/trunk/grafana.service) grafana/repos/community-x86_64/grafana.sysusers (from rev 207356, grafana/trunk/grafana.sysusers) grafana/repos/community-x86_64/grafana.tmpfiles (from rev 207356, grafana/trunk/grafana.tmpfiles) Deleted: grafana/repos/community-i686/PKGBUILD grafana/repos/community-i686/grafana.install grafana/repos/community-i686/grafana.service grafana/repos/community-i686/grafana.sysusers grafana/repos/community-i686/grafana.tmpfiles grafana/repos/community-x86_64/PKGBUILD grafana/repos/community-x86_64/grafana.install grafana/repos/community-x86_64/grafana.service grafana/repos/community-x86_64/grafana.sysusers grafana/repos/community-x86_64/grafana.tmpfiles -----------------------------------+ /PKGBUILD | 144 ++++++++++++++++++++++++++++++++++++ /grafana.install | 26 ++++++ /grafana.service | 30 +++++++ /grafana.sysusers | 2 /grafana.tmpfiles | 6 + community-i686/PKGBUILD | 72 ------------------ community-i686/grafana.install | 20 ----- community-i686/grafana.service | 15 --- community-i686/grafana.sysusers | 1 community-i686/grafana.tmpfiles | 3 community-x86_64/PKGBUILD | 72 ------------------ community-x86_64/grafana.install | 13 --- community-x86_64/grafana.service | 15 --- community-x86_64/grafana.sysusers | 1 community-x86_64/grafana.tmpfiles | 3 15 files changed, 208 insertions(+), 215 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2017-01-14 17:15:53 UTC (rev 207356) +++ community-i686/PKGBUILD 2017-01-14 17:17:14 UTC (rev 207357) @@ -1,72 +0,0 @@ -# $Id$ -# Maintainer: Sébastien "Seblu" Luttringer -# Contributor: Carsten Feuls <archli...@carstenfeuls.de> -# Contributor: Gilles Hamel <hamelg at laposte dot net> - -pkgname=grafana -pkgver=4.0.2 -pkgrel=1 -pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB' -url='http://grafana.org' -arch=('x86_64' 'i686') -license=('Apache') -depends=('glibc' 'freetype2' 'fontconfig') -makedepends=('git' 'go' 'npm') -backup=("etc/grafana.ini") -source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver" - "grafana.service" - "grafana.sysusers" - "grafana.tmpfiles" - ) -install=$pkgname.install -md5sums=('SKIP' - '2f1d73689923ecee92a102a65b91003a' - '49688ed04bb3fac45fd48d0ac99e52d5' - 'a23177c9e555a7d8ede65c86cf21add2') - -prepare() { - cd $pkgname - # apply patch from the source array (should be a pacman feature) - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then - msg2 "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi - done - : -} - -build() { - # $GOPATH tunning - export GOPATH="$srcdir" - export PATH="$PATH:$GOPATH/bin" - mkdir -p "$GOPATH/src/github.com/grafana/" - ln -fsr "$srcdir/grafana/" "$GOPATH/src/github.com/grafana/grafana" - cd "$GOPATH/src/github.com/grafana/grafana" - - # building the backend - go run build.go setup - go run build.go build - - # building the frontend - npm install - npm run build -} - -package() { - install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf" - install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf" - install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service" - cd $pkgname - install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server" - install -Dsm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli" - install -Dm644 conf/sample.ini "$pkgdir/etc/$pkgname.ini" - install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini" - install -dm755 "$pkgdir/usr/share/grafana/" - cp -r vendor "$pkgdir/usr/share/grafana/" - cp -r public_gen "$pkgdir/usr/share/grafana/public" - ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data" -} - -# vim:set ts=2 sw=2 et: Copied: grafana/repos/community-i686/PKGBUILD (from rev 207356, grafana/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Carsten Feuls <archli...@carstenfeuls.de> +# Contributor: Gilles Hamel <hamelg at laposte dot net> + +pkgname=grafana +pkgver=4.1.1 +pkgrel=1 +pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB' +url='http://grafana.org' +arch=('x86_64' 'i686') +license=('Apache') +depends=('glibc' 'freetype2' 'fontconfig') +makedepends=('git' 'go' 'npm') +backup=("etc/grafana.ini") +source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver" + "grafana.service" + "grafana.sysusers" + "grafana.tmpfiles" + ) +install=$pkgname.install +md5sums=('SKIP' + '2f1d73689923ecee92a102a65b91003a' + '49688ed04bb3fac45fd48d0ac99e52d5' + 'a23177c9e555a7d8ede65c86cf21add2') + +prepare() { + cd $pkgname + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done + : +} + +build() { + # $GOPATH tunning + export GOPATH="$srcdir" + export PATH="$PATH:$GOPATH/bin" + mkdir -p "$GOPATH/src/github.com/grafana/" + ln -fsr "$srcdir/grafana/" "$GOPATH/src/github.com/grafana/grafana" + cd "$GOPATH/src/github.com/grafana/grafana" + + # building the backend + go run build.go setup + go run build.go build + + # building the frontend + npm install + npm run build +} + +package() { + install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf" + install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf" + install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service" + cd $pkgname + install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server" + install -Dsm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli" + install -Dm644 conf/sample.ini "$pkgdir/etc/$pkgname.ini" + install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini" + install -dm755 "$pkgdir/usr/share/grafana/" + cp -r vendor "$pkgdir/usr/share/grafana/" + cp -r public_gen "$pkgdir/usr/share/grafana/public" + ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data" +} + +# vim:set ts=2 sw=2 et: Deleted: community-i686/grafana.install =================================================================== --- community-i686/grafana.install 2017-01-14 17:15:53 UTC (rev 207356) +++ community-i686/grafana.install 2017-01-14 17:17:14 UTC (rev 207357) @@ -1,20 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -post_install() { - systemd-sysusers grafana.conf - systemd-tmpfiles --create grafana.conf -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install "$1" - if (( "$(vercmp $2 2.6.0-3)" < 0 )); then - echo '==> Configuration moved to /etc/grafana.ini' - fi - return 0 -} - - -# vim:set ts=2 sw=2 et: Copied: grafana/repos/community-i686/grafana.install (from rev 207356, grafana/trunk/grafana.install) =================================================================== --- community-i686/grafana.install (rev 0) +++ community-i686/grafana.install 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1,13 @@ +#/bin/sh + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if (( "$(vercmp $2 2.6.0-3)" < 0 )); then + echo '==> Configuration moved to /etc/grafana.ini' + fi + return 0 +} + + +# vim:set ts=2 sw=2 et: Deleted: community-i686/grafana.service =================================================================== --- community-i686/grafana.service 2017-01-14 17:15:53 UTC (rev 207356) +++ community-i686/grafana.service 2017-01-14 17:17:14 UTC (rev 207357) @@ -1,15 +0,0 @@ -[Unit] -Description=Grafana service -After=network.target - -[Service] -User=grafana -Group=grafana -WorkingDirectory=/usr/share/grafana -ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini -LimitNOFILE=10000 -TimeoutStopSec=20 -SuccessExitStatus=0 2 - -[Install] -WantedBy=multi-user.target Copied: grafana/repos/community-i686/grafana.service (from rev 207356, grafana/trunk/grafana.service) =================================================================== --- community-i686/grafana.service (rev 0) +++ community-i686/grafana.service 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1,15 @@ +[Unit] +Description=Grafana service +After=network.target + +[Service] +User=grafana +Group=grafana +WorkingDirectory=/usr/share/grafana +ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini +LimitNOFILE=10000 +TimeoutStopSec=20 +SuccessExitStatus=0 2 + +[Install] +WantedBy=multi-user.target Deleted: community-i686/grafana.sysusers =================================================================== --- community-i686/grafana.sysusers 2017-01-14 17:15:53 UTC (rev 207356) +++ community-i686/grafana.sysusers 2017-01-14 17:17:14 UTC (rev 207357) @@ -1 +0,0 @@ -u grafana - - /var/lib/grafana Copied: grafana/repos/community-i686/grafana.sysusers (from rev 207356, grafana/trunk/grafana.sysusers) =================================================================== --- community-i686/grafana.sysusers (rev 0) +++ community-i686/grafana.sysusers 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1 @@ +u grafana - - /var/lib/grafana Deleted: community-i686/grafana.tmpfiles =================================================================== --- community-i686/grafana.tmpfiles 2017-01-14 17:15:53 UTC (rev 207356) +++ community-i686/grafana.tmpfiles 2017-01-14 17:17:14 UTC (rev 207357) @@ -1,3 +0,0 @@ -d /var/lib/grafana 0755 grafana grafana - -d /var/log/grafana 0755 grafana grafana - -L /var/lib/grafana/log - - - - ../../log/grafana Copied: grafana/repos/community-i686/grafana.tmpfiles (from rev 207356, grafana/trunk/grafana.tmpfiles) =================================================================== --- community-i686/grafana.tmpfiles (rev 0) +++ community-i686/grafana.tmpfiles 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1,3 @@ +d /var/lib/grafana 0755 grafana grafana - +d /var/log/grafana 0755 grafana grafana - +L /var/lib/grafana/log - - - - ../../log/grafana Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2017-01-14 17:15:53 UTC (rev 207356) +++ community-x86_64/PKGBUILD 2017-01-14 17:17:14 UTC (rev 207357) @@ -1,72 +0,0 @@ -# $Id$ -# Maintainer: Sébastien "Seblu" Luttringer -# Contributor: Carsten Feuls <archli...@carstenfeuls.de> -# Contributor: Gilles Hamel <hamelg at laposte dot net> - -pkgname=grafana -pkgver=4.1.1 -pkgrel=1 -pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB' -url='http://grafana.org' -arch=('x86_64' 'i686') -license=('Apache') -depends=('glibc' 'freetype2' 'fontconfig') -makedepends=('git' 'go' 'npm') -backup=("etc/grafana.ini") -source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver" - "grafana.service" - "grafana.sysusers" - "grafana.tmpfiles" - ) -install=$pkgname.install -md5sums=('SKIP' - '2f1d73689923ecee92a102a65b91003a' - '49688ed04bb3fac45fd48d0ac99e52d5' - 'a23177c9e555a7d8ede65c86cf21add2') - -prepare() { - cd $pkgname - # apply patch from the source array (should be a pacman feature) - local filename - for filename in "${source[@]}"; do - if [[ "$filename" =~ \.patch$ ]]; then - msg2 "Applying patch ${filename##*/}" - patch -p1 -N -i "$srcdir/${filename##*/}" - fi - done - : -} - -build() { - # $GOPATH tunning - export GOPATH="$srcdir" - export PATH="$PATH:$GOPATH/bin" - mkdir -p "$GOPATH/src/github.com/grafana/" - ln -fsr "$srcdir/grafana/" "$GOPATH/src/github.com/grafana/grafana" - cd "$GOPATH/src/github.com/grafana/grafana" - - # building the backend - go run build.go setup - go run build.go build - - # building the frontend - npm install - npm run build -} - -package() { - install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf" - install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf" - install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service" - cd $pkgname - install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server" - install -Dsm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli" - install -Dm644 conf/sample.ini "$pkgdir/etc/$pkgname.ini" - install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini" - install -dm755 "$pkgdir/usr/share/grafana/" - cp -r vendor "$pkgdir/usr/share/grafana/" - cp -r public_gen "$pkgdir/usr/share/grafana/public" - ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data" -} - -# vim:set ts=2 sw=2 et: Copied: grafana/repos/community-x86_64/PKGBUILD (from rev 207356, grafana/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Sébastien "Seblu" Luttringer +# Contributor: Carsten Feuls <archli...@carstenfeuls.de> +# Contributor: Gilles Hamel <hamelg at laposte dot net> + +pkgname=grafana +pkgver=4.1.1 +pkgrel=1 +pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB' +url='http://grafana.org' +arch=('x86_64' 'i686') +license=('Apache') +depends=('glibc' 'freetype2' 'fontconfig') +makedepends=('git' 'go' 'npm') +backup=("etc/grafana.ini") +source=("git+https://github.com/grafana/grafana.git#tag=v$pkgver" + "grafana.service" + "grafana.sysusers" + "grafana.tmpfiles" + ) +install=$pkgname.install +md5sums=('SKIP' + '2f1d73689923ecee92a102a65b91003a' + '49688ed04bb3fac45fd48d0ac99e52d5' + 'a23177c9e555a7d8ede65c86cf21add2') + +prepare() { + cd $pkgname + # apply patch from the source array (should be a pacman feature) + local filename + for filename in "${source[@]}"; do + if [[ "$filename" =~ \.patch$ ]]; then + msg2 "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" + fi + done + : +} + +build() { + # $GOPATH tunning + export GOPATH="$srcdir" + export PATH="$PATH:$GOPATH/bin" + mkdir -p "$GOPATH/src/github.com/grafana/" + ln -fsr "$srcdir/grafana/" "$GOPATH/src/github.com/grafana/grafana" + cd "$GOPATH/src/github.com/grafana/grafana" + + # building the backend + go run build.go setup + go run build.go build + + # building the frontend + npm install + npm run build +} + +package() { + install -Dm644 grafana.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/grafana.conf" + install -Dm644 grafana.sysusers "$pkgdir/usr/lib/sysusers.d/grafana.conf" + install -Dm644 grafana.service "$pkgdir/usr/lib/systemd/system/grafana.service" + cd $pkgname + install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server" + install -Dsm755 bin/grafana-cli "$pkgdir/usr/bin/grafana-cli" + install -Dm644 conf/sample.ini "$pkgdir/etc/$pkgname.ini" + install -Dm644 conf/defaults.ini "$pkgdir/usr/share/$pkgname/conf/defaults.ini" + install -dm755 "$pkgdir/usr/share/grafana/" + cp -r vendor "$pkgdir/usr/share/grafana/" + cp -r public_gen "$pkgdir/usr/share/grafana/public" + ln -s ../../../var/lib/grafana "$pkgdir/usr/share/grafana/data" +} + +# vim:set ts=2 sw=2 et: Deleted: community-x86_64/grafana.install =================================================================== --- community-x86_64/grafana.install 2017-01-14 17:15:53 UTC (rev 207356) +++ community-x86_64/grafana.install 2017-01-14 17:17:14 UTC (rev 207357) @@ -1,13 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if (( "$(vercmp $2 2.6.0-3)" < 0 )); then - echo '==> Configuration moved to /etc/grafana.ini' - fi - return 0 -} - - -# vim:set ts=2 sw=2 et: Copied: grafana/repos/community-x86_64/grafana.install (from rev 207356, grafana/trunk/grafana.install) =================================================================== --- community-x86_64/grafana.install (rev 0) +++ community-x86_64/grafana.install 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1,13 @@ +#/bin/sh + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if (( "$(vercmp $2 2.6.0-3)" < 0 )); then + echo '==> Configuration moved to /etc/grafana.ini' + fi + return 0 +} + + +# vim:set ts=2 sw=2 et: Deleted: community-x86_64/grafana.service =================================================================== --- community-x86_64/grafana.service 2017-01-14 17:15:53 UTC (rev 207356) +++ community-x86_64/grafana.service 2017-01-14 17:17:14 UTC (rev 207357) @@ -1,15 +0,0 @@ -[Unit] -Description=Grafana service -After=network.target - -[Service] -User=grafana -Group=grafana -WorkingDirectory=/usr/share/grafana -ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini -LimitNOFILE=10000 -TimeoutStopSec=20 -SuccessExitStatus=0 2 - -[Install] -WantedBy=multi-user.target Copied: grafana/repos/community-x86_64/grafana.service (from rev 207356, grafana/trunk/grafana.service) =================================================================== --- community-x86_64/grafana.service (rev 0) +++ community-x86_64/grafana.service 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1,15 @@ +[Unit] +Description=Grafana service +After=network.target + +[Service] +User=grafana +Group=grafana +WorkingDirectory=/usr/share/grafana +ExecStart=/usr/bin/grafana-server --config=/etc/grafana.ini +LimitNOFILE=10000 +TimeoutStopSec=20 +SuccessExitStatus=0 2 + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/grafana.sysusers =================================================================== --- community-x86_64/grafana.sysusers 2017-01-14 17:15:53 UTC (rev 207356) +++ community-x86_64/grafana.sysusers 2017-01-14 17:17:14 UTC (rev 207357) @@ -1 +0,0 @@ -u grafana - - /var/lib/grafana Copied: grafana/repos/community-x86_64/grafana.sysusers (from rev 207356, grafana/trunk/grafana.sysusers) =================================================================== --- community-x86_64/grafana.sysusers (rev 0) +++ community-x86_64/grafana.sysusers 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1 @@ +u grafana - - /var/lib/grafana Deleted: community-x86_64/grafana.tmpfiles =================================================================== --- community-x86_64/grafana.tmpfiles 2017-01-14 17:15:53 UTC (rev 207356) +++ community-x86_64/grafana.tmpfiles 2017-01-14 17:17:14 UTC (rev 207357) @@ -1,3 +0,0 @@ -d /var/lib/grafana 0755 grafana grafana - -d /var/log/grafana 0755 grafana grafana - -L /var/lib/grafana/log - - - - ../../log/grafana Copied: grafana/repos/community-x86_64/grafana.tmpfiles (from rev 207356, grafana/trunk/grafana.tmpfiles) =================================================================== --- community-x86_64/grafana.tmpfiles (rev 0) +++ community-x86_64/grafana.tmpfiles 2017-01-14 17:17:14 UTC (rev 207357) @@ -0,0 +1,3 @@ +d /var/lib/grafana 0755 grafana grafana - +d /var/log/grafana 0755 grafana grafana - +L /var/lib/grafana/log - - - - ../../log/grafana