From c11c399b93af926780a2fce8a80faac36814cb51 Mon Sep 17 00:00:00 2001 From: MeganerdNL Date: Sat, 29 Jul 2023 14:15:41 +0200 Subject: [PATCH] grafana: update to 10.0.3 --- srcpkgs/grafana/files/grafana/run | 3 +-- srcpkgs/grafana/template | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/srcpkgs/grafana/files/grafana/run b/srcpkgs/grafana/files/grafana/run index f1d961e83f484..70113906b4b97 100755 --- a/srcpkgs/grafana/files/grafana/run +++ b/srcpkgs/grafana/files/grafana/run @@ -1,4 +1,3 @@ #!/bin/sh exec 2>&1 - -exec chpst -u _grafana:_grafana grafana-server -homepath /usr/share/grafana/ -config /etc/grafana/grafana.ini 2>&1 +exec chpst -u _grafana:_grafana grafana server -homepath /usr/share/grafana/ -config /etc/grafana/grafana.ini 2>&1 diff --git a/srcpkgs/grafana/template b/srcpkgs/grafana/template index 4f1340bcca407..75db1925d8285 100644 --- a/srcpkgs/grafana/template +++ b/srcpkgs/grafana/template @@ -1,10 +1,10 @@ # Template file for 'grafana' pkgname=grafana -version=8.5.24 +version=10.0.3 revision=1 build_style=go go_import_path=github.com/grafana/grafana -go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server" +go_package="${go_import_path}/pkg/cmd/grafana-cli ${go_import_path}/pkg/cmd/grafana-server ${go_import_path}/pkg/cmd/grafana" hostmakedepends="tar make" short_desc="Open platform for beautiful analytics and monitoring" maintainer="Michael Aldridge " @@ -12,8 +12,8 @@ license="Apache-2.0" homepage="https://grafana.com" distfiles="https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz https://github.com/grafana/grafana/archive/v${version}.tar.gz" -checksum="ff088012f356bcece24e5c89f924fed83a3b63736ec2cc9bc2a66341bf8fe00c -9332fea516f617e6f9b418f28154f4f8f162c2abb3b739cc6ae7fedac21ddc41" +checksum="daeb7eee1327b6d407cdaaf1a234ec9d8e2ae5a6d085e0fd3d8c606214eb6032 +9c1a1e3a9133abe4140aabad0d968f43ec2b3b14309f0dff80da367220bf58ff" system_accounts="_grafana" _grafana_homedir="/var/lib/grafana" @@ -35,7 +35,7 @@ pre_build() { do_install() { # only install grafana binaries - GOPATH/bin contains eg. wire used at # buildtime, which we don't want in the package - for f in ${GOPATH}/bin/grafana-* ${GOPATH}/bin/*/grafana-*; do + for f in ${GOPATH}/bin/grafana* ${GOPATH}/bin/*/grafana*; do if [ -f "$f" ] && [ -x "$f" ]; then vbin "$f" fi