From 1cc9bb36122a3b38df3a2384d4f3ed66b680696d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Tue, 21 Apr 2026 06:02:45 +0200 Subject: [PATCH] [www-apps/grafana] bump --- www-apps/grafana/Manifest | 6 +++--- www-apps/grafana/files/grafana.initd | 4 ++-- www-apps/grafana/files/grafana.service | 2 +- ...na-12.4.1.ebuild => grafana-13.0.1.ebuild} | 20 ++++++------------- 4 files changed, 12 insertions(+), 20 deletions(-) rename www-apps/grafana/{grafana-12.4.1.ebuild => grafana-13.0.1.ebuild} (86%) diff --git a/www-apps/grafana/Manifest b/www-apps/grafana/Manifest index e637b74..29508ea 100644 --- a/www-apps/grafana/Manifest +++ b/www-apps/grafana/Manifest @@ -1,4 +1,4 @@ -DIST grafana-12.4.1-vendor.tar.xz 55656652 BLAKE2B 9eca35b723865365a0b17f9431803488b5fa83ea22163aad61a1ce7d32fc2b80f995a8ec30526c70552d829c74bbddba4a45358bfac77e7f6b5a2f4d8d0019d0 SHA512 59dd3eaa55fb61bdeb03df9825c59b3b5acae1f2b862a06d1ec03072864d1f664e2a6167a5065ed8dca8755fbcf4e85803e522f88d384a33c8323bae2e91cef2 -DIST grafana-12.4.1-vendor_yarn.tar.xz 385003752 BLAKE2B 4ce578ff4ed5c2d70f44b54ebd1ad33d7bd7faf9c0b1ec12a546a92fa8cdd41b1c2504eece09733af65fbc77f13b7027b68b2e43a9fb15f474a01e8e73286bf4 SHA512 d55b8b422832275ff3da7530b197dcc51a770592e2992ecf14a3cd41452353dabd3da7d8b5c3f6fcbc9be35a27b45e9f5fbb4193cccc4fdf47c02906405a85ec -DIST grafana-12.4.1.tar.gz 42619300 BLAKE2B 98374a20fb6fbf0ec3c370655d093b0c8838b86627d9b3ab9a0badad9fa3b5a5a297e59e5367635773f02043947775cafcb97aa5ca25fca64807616816bcae5c SHA512 1f9994cf658d5859c3e1a6964fd898b928affec7a9b77433f55729701cc927a1815ea1df900bd0b7a7958a71e73991eb6b4df0a1a0227e2516754511a8d479e2 +DIST grafana-13.0.1-vendor.tar.xz 52825596 BLAKE2B ad2e2d2aa938ac7ef6f51492d046fe3289370a013a18512d8e181edfeacd97a073b7a057ac56b485bcb3f18899fa1a83bf4bef10f274762824e6665cfebbc8ae SHA512 3cc9d9a446818b273c6463d3f30f478ee0db20e1f3016cb5f40e670e7918e230e6330b195b2defcdac3fbfab631476171d539ba36c2707e35120a146aba111b6 +DIST grafana-13.0.1-vendor_yarn.tar.xz 359622896 BLAKE2B 7ebc10a5d857e215e7b98ffe03cad3ab9791b3f715cef8e7a1a1760ddf70532e45770013f075f838e69430889b931d012fdc4ad094ea60c9d18a4e4ce1a2d168 SHA512 ec38ffd0bf46b1d5fa48f5e0a4e078eea2484c90950dc9b564419b7999b8efe0b7449be8db1a662ed323a3ef5a63e84dfd6a0a4a23547bbf1436a983ba5f5203 +DIST grafana-13.0.1.tar.gz 45566554 BLAKE2B 3f3f61f6928dab8bd6887ac2bf3fcf1427540d122911d5eec43dcc7df664feed7cffafc4f736e688cca4ac4ab4cab081d372283ea9b8bd62c6092e9feb36b974 SHA512 c7212e851c9439f996584d91b69ece3b1c5b22f0a9f7b6618803ab4f13604fe442c3c6f31dfa358e1e2dc36fe8d11381659d592d3a650dc34944a16496026487 DIST yarn-4.11.0.cjs 2991245 BLAKE2B c7386c4ead0763b51700ff68c66fff539a3cb4a833694593f57a565bdb0725f575937bc8845dbb9e54aa17f514b01b82094f90fef00ed66bd27f24170af0a7ab SHA512 4e54aeace9141df2f0177c266b05ec50dc044638157dae128c471ba65994ac802122d7ab35bcd9e81641228b7dcf24867d28e750e0bcae8a05277d600008ad54 diff --git a/www-apps/grafana/files/grafana.initd b/www-apps/grafana/files/grafana.initd index f0b6ed7..f5d784b 100644 --- a/www-apps/grafana/files/grafana.initd +++ b/www-apps/grafana/files/grafana.initd @@ -11,8 +11,8 @@ description="The open-source platform for monitoring and observability" : ${SSD_OPTS:="-w 1000"} name="Grafana" -command="/usr/bin/~PN_S~-server" -command_args="${GRAFANA_OPTS}" +command="/usr/bin/~PN_S~" +command_args="server ${GRAFANA_OPTS}" command_user="${GRAFANA_USER}" command_background=true directory="/usr/share/~PN_S~" diff --git a/www-apps/grafana/files/grafana.service b/www-apps/grafana/files/grafana.service index 48d12ca..1f00bc5 100644 --- a/www-apps/grafana/files/grafana.service +++ b/www-apps/grafana/files/grafana.service @@ -11,7 +11,7 @@ Type=simple Restart=on-failure RuntimeDirectory=~PN_S~ WorkingDirectory=/usr/share/~PN_S~ -ExecStart=/usr/libexec/~PN_S~/grafana-server \ +ExecStart=/usr/libexec/~PN_S~/grafana server \ --config=/etc/~PN_S~/grafana.ini \ --pidfile=/run/~PN_S~/grafana.pid \ cfg:default.paths.logs=/var/log/~PN_S~ \ diff --git a/www-apps/grafana/grafana-12.4.1.ebuild b/www-apps/grafana/grafana-13.0.1.ebuild similarity index 86% rename from www-apps/grafana/grafana-12.4.1.ebuild rename to www-apps/grafana/grafana-13.0.1.ebuild index 7bc3781..76329a2 100644 --- a/www-apps/grafana/grafana-12.4.1.ebuild +++ b/www-apps/grafana/grafana-13.0.1.ebuild @@ -12,6 +12,7 @@ DESCRIPTION="The open-source platform for monitoring and observability" HOMEPAGE="https://grafana.com" yarn_version="4.11.0" +# XXX: remove cypress with 13.1 check playwright interference ## building vendor and yarn vendors needs nodejs[npm] # >> git clone https://github.com/grafana/grafana -b v /tmp/grafana # >> cd /tmp/grafana && version=`git describe --tags | sed -E "s/v([0-9.]+)/\1/g"` @@ -30,7 +31,7 @@ SRC_URI=" https://repo.yarnpkg.com/${yarn_version}/packages/yarnpkg-cli/bin/yarn.js -> yarn-${yarn_version}.cjs " LICENSE="AGPL-3.0 Apache-2.0 BSD-2 BSD-3 BSD-4 BSL-1.0 ImageMagick ISC LGPL-3.0 MIT MPL-2.0 OpenSSL Zlib" -SLOT="12/"${PV} +SLOT="13/"${PV} KEYWORDS="~amd64" IUSE="systemd" RESTRICT="test" # Tests not working (a proper fix would take too long) @@ -57,6 +58,7 @@ src_prepare() { conf/sample.ini || die "prepare failed" ## offline/cache installation + sed -i 's/enableGlobalCache: true/enableGlobalCache: false/' .yarnrc.yml echo -e "enableMirror: true\ncacheFolder: ./vendor_yarn" >> .yarnrc.yml sed -i '/^yarnPath/d' .yarnrc.yml echo "yarnPath: .yarn/releases/yarn-${yarn_version}.cjs" >> .yarnrc.yml @@ -67,9 +69,6 @@ src_prepare() { cp -a "${FILESDIR}/${PN}".* files || die "coudln't copy needed files!" sed -i "s/~PN_S~/${PN_S}/g" files/* || die "couldn't apply slot-patches!" - ## setting build-info - sed -i 's/unknown-dev/gentoo/g' pkg/build/git.go - default } @@ -78,9 +77,9 @@ src_compile() { CYPRESS_INSTALL_BINARY=0 PUPPETEER_SKIP_DOWNLOAD=1 yarn install || die "prepare failed" einfo "Wiring everything up.." - wire gen -tags oss ./pkg/server ./pkg/cmd/grafana-cli/runner || die "wiring failed" + wire gen -tags oss ./pkg/server || die "wiring failed" einfo "Building binaries using go.." - go run build.go build || die "compile failed" + make build-go || die "compile failed" einfo "Building frontend using webpack.." # beware, we need at least 8G RAM (@32T) export NODE_OPTIONS="--max-old-space-size=8192" @@ -93,19 +92,12 @@ src_install() { newins conf/ldap.toml ldap.toml exeinto /usr/libexec/${PN_S} - newexe `(find bin -name ${PN})` ${PN} - ## legacy - newexe `(find bin -name ${PN}-cli)` ${PN}-cli - newexe `(find bin -name ${PN}-server)` ${PN}-server + newexe `(find bin -maxdepth 1 -name ${PN})` ${PN} exeinto /usr/bin echo -e "#"'!'"/bin/sh\nPATH=\"/usr/libexec/${PN_S}:\${PATH}\" && ${PN} \$@" >> ${D}/usr/bin/${PN_S} - echo -e "#"'!'"/bin/sh\nPATH=\"/usr/libexec/${PN_S}:\${PATH}\" && ${PN} cli --homepath /var/lib/${PN_S} --pluginsDir /var/lib/${PN_S}/plugins \$@" >> ${D}/usr/bin/${PN_S}-cli - echo -e "#"'!'"/bin/sh\nPATH=\"/usr/libexec/${PN_S}:\${PATH}\" && ${PN} server --homepath /var/lib/${PN_S} \$@" >> ${D}/usr/bin/${PN_S}-server fperms +x /usr/bin/${PN_S} - fperms +x /usr/bin/${PN_S}-cli - fperms +x /usr/bin/${PN_S}-server insinto "/usr/share/${PN_S}" doins -r public conf tools