update to grafana-7.4.5, thanks Rob Schmersel for testing

This commit is contained in:
sthen 2021-03-21 17:47:17 +00:00
parent 072c1902f5
commit 456cabf246
4 changed files with 1038 additions and 494 deletions

View File

@ -1,18 +1,24 @@
# $OpenBSD: Makefile,v 1.16 2021/03/19 12:52:38 sthen Exp $
# $OpenBSD: Makefile,v 1.17 2021/03/21 17:47:17 sthen Exp $
COMMENT = monitoring and metric analytics dashboards
GH_ACCOUNT = grafana
GH_PROJECT = grafana
GH_TAGNAME = v6.7.6
BUILD_ID = a2a620545dc45e05493f
V = 7.4.5
DISTNAME = grafana+vendor-$V
WRKDIST = ${WRKDIR}/grafana-$V
EXTRACT_SUFX = .tar.zstd
PKGNAME = grafana-$V
BUILD_ID = 63a9c1d648180e457252
CATEGORIES = sysutils
HOMEPAGE = https://grafana.com
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
${GH_PROJECT}-${GH_TAGNAME:C/^v//}.linux-amd64${EXTRACT_SUFX}:0
grafana-$V.linux-amd64.tar.gz:0
# generated by fetching archive from
# https://github.com/grafana/grafana/archive/v$V/grafana-$V.tar.gz
# and running "go mod tidy" + "go mod vendor"
MASTER_SITES = https://spacehopper.org/mirrors/
MASTER_SITES0 = https://dl.grafana.com/oss/release/
# Apache 2.0 (bundles roboto and opensans fonts)
@ -22,14 +28,18 @@ MODULES = lang/go
WANTLIB += c pthread
SUBST_VARS += BUILD_ID
MODGO_FLAGS += -ldflags="-w -X main.version=${GH_TAGNAME:C/^v//}"
MODGO_FLAGS += -ldflags="-w -X main.version=$V"
# remove linux binaries from grafana-$V.linux-amd64.tar.gz
post-extract:
rm ${WRKDIST}/bin/*
do-build:
cd ${WRKSRC} && ${MODGO_CMD} build ${MODGO_FLAGS} -o bin/grafana-server ./pkg/cmd/grafana-server
cd ${WRKSRC} && ${MODGO_CMD} build ${MODGO_FLAGS} -o bin/grafana-cli ./pkg/cmd/grafana-cli
cd ${WRKSRC} && ${MODGO_CMD} run ${MODGO_FLAGS} build.go setup
cd ${WRKSRC} && ${MODGO_CMD} run ${MODGO_FLAGS} build.go build
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/grafana-{server,cli} ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/bin/openbsd-*/grafana-{server,cli} ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/grafana
${SUBST_CMD} ${WRKSRC}/conf/sample.ini
.for c in sample.ini ldap.toml

View File

@ -1,4 +1,4 @@
SHA256 (grafana-6.7.6.linux-amd64.tar.gz) = IvV/4YkwOgwP6J9ksNV2NKeXAr2BFBW3JNYfybI2U2E=
SHA256 (grafana-6.7.6.tar.gz) = N5C+6OHbZsZxpp3aQx/X2CfRSkWUkwREz+oVSXJEMSE=
SIZE (grafana-6.7.6.linux-amd64.tar.gz) = 65122660
SIZE (grafana-6.7.6.tar.gz) = 15987845
SHA256 (grafana+vendor-7.4.5.tar.zstd) = o53h0MaSr6ZvUH71CWaCpqKYKJOrZmtRQyI9Kc9IDrQ=
SHA256 (grafana-7.4.5.linux-amd64.tar.gz) = n/8g7/1oLzIS4ajuIfRsvlNat6L4GctMNpadwfnoMvU=
SIZE (grafana+vendor-7.4.5.tar.zstd) = 20036984
SIZE (grafana-7.4.5.linux-amd64.tar.gz) = 51268864

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-conf_sample_ini,v 1.6 2020/04/15 18:18:19 martin Exp $
$OpenBSD: patch-conf_sample_ini,v 1.7 2021/03/21 17:47:17 sthen Exp $
Index: conf/sample.ini
--- conf/sample.ini.orig
@ -27,7 +27,7 @@ Index: conf/sample.ini
#################################### Server ####################################
[server]
@@ -486,7 +486,7 @@
@@ -520,7 +520,7 @@
[log]
# Either "console", "file", "syslog". Default is console and file
# Use space to separate multiple modes, e.g. "console file"

File diff suppressed because it is too large Load Diff