fixing broken build functions, updating to grafana 4.0, adopting this package

4 files changed, 31 insertions, 104 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9704533a563..2fe804b4acb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,25 @@
 # Generated by mksrcinfo v8
-# Fri Jan  1 12:51:28 UTC 2016
+# Fri Dec 16 03:41:51 UTC 2016
 pkgbase = grafana-git
 	pkgdesc = A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb
-	pkgver = v2.6.0.r179.gc0cf0cb
-	pkgrel = 1
+	pkgver = v4.0.2.r283.g830bf5a
+	pkgrel = 2
 	url = http://grafana.org
 	install = grafana.install
 	arch = x86_64
 	arch = i686
 	license = APACHE
 	makedepends = go
-	makedepends = godep
 	makedepends = nodejs-grunt-cli
 	makedepends = npm
 	provides = grafana
 	conflicts = grafana
-	backup = etc/grafana/grafana.ini
+	options = !strip
+	options = !emptydirs
 	source = git+https://github.com/grafana/grafana
-	source = config.patch
 	source = grafana.service
 	md5sums = SKIP
-	md5sums = 6e514b0d3aea075d5349be463ff6daeb
-	md5sums = 05508c9c21f4c93ad86944a52d37e925
+	md5sums = bb223073eac39f0ccf9cb8b57fe8d685
 
 pkgname = grafana-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3793213db8d1..4f2e5a54cc78 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,52 @@
-# Maintainer: Justin Dray <justin@dray.be>
+# Maintainer: Matthew McGinn <mamcgi at gmail dot com>
+# Contributor: Justin Dray <justin@dray.be>
 # Contributor: Gilles Hamel <hamelg at laposte dot net>
 _pkgname=grafana
 pkgname=${_pkgname}-git
-pkgver=v2.6.0.r179.gc0cf0cb
-pkgrel=1
+pkgver=v4.0.2.r283.g830bf5a
+pkgrel=2
 pkgdesc="A general purpose dashboard and graph composer. It supports graphite, influxdb or opentsdb"
 url="http://grafana.org"
 arch=('x86_64' 'i686')
 license=('APACHE')
-depends=()
-makedepends=(go godep nodejs-grunt-cli npm)
-provides=grafana
-conflicts=grafana
+makedepends=('go' 'nodejs-grunt-cli' 'npm')
+provides=('grafana')
+options=('!strip' '!emptydirs')
+conflicts=('grafana')
 install=${_pkgname}.install
-backup=("etc/${_pkgname}/${_pkgname}.ini")
 source=("git+https://github.com/${_pkgname}/${_pkgname}"
-        "config.patch"
         "grafana.service")
 md5sums=('SKIP'
-         '6e514b0d3aea075d5349be463ff6daeb'
-         '05508c9c21f4c93ad86944a52d37e925')
+         'bb223073eac39f0ccf9cb8b57fe8d685')
 
 pkgver() {
-	cd "${srcdir}/${_pkgname}"
+	cd "${_pkgname}"
 	git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare () {
-	cd "${_pkgname}"
-	patch -p1 -i "${srcdir}"/config.patch
-}
 
 build() {
-	export GOPATH="${srcdir}/${_pkgname}"
-	export PATH="$PATH:$GOPATH/bin"
-	cd "$GOPATH"
+	export GOPATH="${srcdir}"
+	export PATH="$PATH:$GOPATH"
+	mkdir -p "$GOPATH/src/github.com/${_pkgname}/"
+	ln -nfs "${srcdir}/grafana" "$GOPATH/src/github.com/${_pkgname}/${_pkgname}"
+	cd "$GOPATH/src/github.com/${_pkgname}/${_pkgname}"
 	go run build.go setup
-	godep restore
-	mkdir -p "$GOPATH/src/github.com/grafana/grafana/"
-	ln -s "$GOPATH/pkg" "$GOPATH/src/github.com/grafana/grafana/"
-
+	go run build.go build
 	# Build frontend assets
 	npm install
-	# Install phantomjs in this directory as well for some reason
-	cd node_modules/karma-phantomjs-launcher
-	npm install
-	cd "$GOPATH"
-	grunt
-	grunt build
-	grunt build-post-process
-
-	# build the backend
-	# no longer doing package build since this just kicks off rpm/deb builds at the end.
-	#go run build.go build package
-	go run build.go build
+	npm run build
 }
 
 package() {
-	install -Dm644 "${srcdir}/grafana.service" "$pkgdir/usr/lib/systemd/system/grafana.service"
+	install -Dm644 "${srcdir}/grafana.service" "${pkgdir}/usr/lib/systemd/system/grafana.service"
 	cd "${srcdir}/${_pkgname}"
 	install -dm755 "${pkgdir}/var/lib/grafana"
 	install -dm755 "${pkgdir}/var/log/grafana"
-	install -Dsm755 bin/grafana-server "$pkgdir/usr/bin/grafana-server"
-	install -Dm644 conf/sample.ini "$pkgdir/etc/${_pkgname}/${_pkgname}.ini"
-	install -Dm644 conf/defaults.ini "$pkgdir/usr/share/grafana/conf/defaults.ini"
-	cp -r public vendor "$pkgdir/usr/share/grafana/"
+	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}/${_pkgname}.ini"
+	mkdir -p "${pkgdir}/usr/share/grafana"
+	cp -r * "${pkgdir}/usr/share/grafana/"
+	rm -rf * "${pkgdir}/usr/share/grafana/data"
 }
diff --git a/config.patch b/config.patch
deleted file mode 100644
index 066436470b43..000000000000
--- a/config.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/conf/defaults.ini b/conf/defaults.ini
-index 0693044..da59457 100644
---- a/conf/defaults.ini
-+++ b/conf/defaults.ini
-@@ -10,15 +10,15 @@ app_mode = production
- [paths]
- # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
- #
--data = data
-+data = /var/lib/grafana
- #
- # Directory where grafana can store logs
- #
--logs = data/log
-+logs = /var/log/grafana
- #
- # Directory where grafana will automatically scan and look for plugins
- #
--plugins = data/plugins
-+plugins = /var/lib/grafana/plugins
- 
- #################################### Server ####################################
- [server]
-@@ -45,7 +45,7 @@ root_url = %(protocol)s://%(domain)s:%(http_port)s/
- router_logging = false
- 
- # the path relative working path
--static_root_path = public
-+static_root_path = /usr/share/grafana/public
- 
- # enable gzip
- enable_gzip = false
-@@ -67,7 +67,7 @@ password =
- ssl_mode = disable
- 
- # For "sqlite3" only, path relative to data_path setting
--path = grafana.db
-+path = /var/lib/grafana/grafana.db
- 
- #################################### Session ####################################
- [session]
-diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go
-index ec11a9a..01862ee 100644
---- a/pkg/components/renderer/renderer.go
-+++ b/pkg/components/renderer/renderer.go
-@@ -21,7 +21,7 @@ type RenderOpts struct {
- 
- func RenderToPng(params *RenderOpts) (string, error) {
- 	log.Info("PhantomRenderer::renderToPng url %v", params.Url)
--	binPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, "phantomjs"))
-+	binPath := "/usr/bin/phantomjs"
- 	scriptPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, "render.js"))
- 	pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, util.GetRandomString(20)))
- 	pngPath = pngPath + ".png"
diff --git a/grafana.service b/grafana.service
index 38e720fd2f69..ba3ebb3de16f 100644
--- a/grafana.service
+++ b/grafana.service
@@ -5,8 +5,7 @@ After=network.target
 [Service]
 User=grafana
 Group=grafana
-WorkingDirectory=/usr/share/grafana
-ExecStart=/usr/bin/grafana-server --config=/etc/grafana/grafana.ini
+ExecStart=/usr/bin/grafana-server --config=/etc/grafana/grafana.ini --homepath=/usr/share/grafana
 LimitNOFILE=10000
 TimeoutStopSec=20
 SuccessExitStatus=0 2