From f4cc7773096a59b39dba69442e44d69662345554c40b88022a5eeb934764bf6f Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Tue, 19 May 2020 07:37:55 +0000 Subject: [PATCH] Accepting request 805824 from home:SchoolGuy:branches:server:monitoring Docs about patching the JS frontend OBS-URL: https://build.opensuse.org/request/show/805824 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/grafana?expand=0&rev=39 --- Makefile | 3 +++ README | 11 +++++++++++ grafana.changes | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/Makefile b/Makefile index 6cb6999..d8fdae4 100644 --- a/Makefile +++ b/Makefile @@ -21,6 +21,9 @@ tar: gunzip ../$$tar.gz && \ tar -xf ../$$tar && \ cd $$basename && \ + # Patches for the JS frontend go after here + # No patches currently needed + # End patches section # exclude the phantomjs-prebuilt binary module from the webpack \ sed -i '/phantomjs-prebuilt/d' package.json && \ # nuke grunt task for copying phantomjs \ diff --git a/README b/README index a69787b..0f7c185 100644 --- a/README +++ b/README @@ -26,4 +26,15 @@ grunt installed. To get set up, run: Then, to package a new release of Grafana, run `make` then `osc ci` and you should be good. +If you have a patch for the Javascript frontend to apply you need +to do the following: + +- Create the patch and add it with `osc add ` to the repo +- Open the Makefile +- Add after the `cd $$basename && \` the patch with: + `patch -p1 < ../../000x-.patch && \` +- Do NOT add the patch to the Specfile. +- Then use the process of building Grafana as described above. + Please direct any questions to Tim Serong +If Tim is not available you may also contact Enno Gotthold diff --git a/grafana.changes b/grafana.changes index 3371f5f..27eb676 100644 --- a/grafana.changes +++ b/grafana.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 14 13:57:48 UTC 2020 - Enno Gotthold + +- Add instructions for patching the Grafana javascript frontend. + ------------------------------------------------------------------- Tue May 5 17:34:34 UTC 2020 - Jeff Kowalczyk