diff --git a/grafana.spec b/grafana.spec index 46af5d17e741c26142a0aef80e0039b45a8513f5..bb0564a7a6b06f3a8af1b69557337c14d67279b8 100644 --- a/grafana.spec +++ b/grafana.spec @@ -7,7 +7,7 @@ Name: grafana Version: 7.5.15 -Release: 5 +Release: 6 Summary: Metrics dashboard and graph editor License: Apache 2.0 URL: https://grafana.org @@ -27,6 +27,10 @@ Source5: build_frontend.sh Source6: list_bundled_nodejs_packages.py # Source7 contains the script to create the vendor and webpack bundles in a container Source7: create_bundles_in_container.sh +%ifarch loongarch64 +#Source8 from https://github.com/golang/sys version: v0.4.0 +Source8: sys.tar.gz +%endif # Patches Patch1: 001-wrappers-grafana-cli.patch @@ -428,6 +432,10 @@ rm -r plugins-bundled # Set up build subdirs and links mkdir -p %{_builddir}/src/github.com/grafana +%ifarch loongarch64 +rm -rf vendor/golang.org/x/sys +tar -xf %{SOURCE8} -C vendor/golang.org/x/ +%endif ln -s %{_builddir}/%{name}-%{version} \ %{_builddir}/src/github.com/grafana/grafana @@ -588,9 +596,12 @@ rm -r pkg/macaron %changelog -* Mon Jan 22 2024 yaoxin - 7.5.15-5 +* Mon Jan 22 2024 yaoxin - 7.5.15-6 - Rebuild for golang cves: CVE-2023-39325 and CVE-2022-32148 +* Thu Jul 13 2023 Wenlong Zhang - 7.5.15-5 +- add loong64 support for grafana + * Thu Apr 13 2023 wangkai <13474090681@163.com> - 7.5.15-4 - Fix gtime_test diff --git a/sys.tar.gz b/sys.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..3846aa8eedcbb66d51ad5ff509e3a6e5c334c9b8 Binary files /dev/null and b/sys.tar.gz differ