mirror of
https://github.com/ceph/ceph
synced 2025-02-22 10:37:15 +00:00
spec: debian: monitoring: build jsonnet from source to use 0.18.0
As this new version is recently released it's still not in every distro we use. We now build jsonnet from source so that we can use this new version of jsonnet. This commit could be reverted later on when the new version would be available everywhere. Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
This commit is contained in:
parent
98236e3a1d
commit
ecaf9070ae
@ -345,7 +345,6 @@ BuildRequires: lz4-devel >= 1.7
|
||||
BuildRequires: golang
|
||||
%if 0%{?fedora} || 0%{?rhel}
|
||||
BuildRequires: golang-github-prometheus
|
||||
BuildRequires: jsonnet
|
||||
BuildRequires: libtool-ltdl-devel
|
||||
BuildRequires: ninja-build
|
||||
BuildRequires: xmlsec1
|
||||
@ -364,7 +363,6 @@ BuildRequires: python%{python3_pkgversion}-pyOpenSSL
|
||||
%endif
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: golang-github-prometheus-prometheus
|
||||
BuildRequires: jsonnet
|
||||
BuildRequires: libxmlsec1-1
|
||||
BuildRequires: libxmlsec1-nss1
|
||||
BuildRequires: libxmlsec1-openssl1
|
||||
|
1
debian/control
vendored
1
debian/control
vendored
@ -24,7 +24,6 @@ Build-Depends: automake,
|
||||
hostname <pkg.ceph.check>,
|
||||
javahelper,
|
||||
jq <pkg.ceph.check>,
|
||||
jsonnet <pkg.ceph.check>,
|
||||
junit4,
|
||||
libaio-dev,
|
||||
libbabeltrace-ctf-dev,
|
||||
|
@ -17,6 +17,17 @@ if(WITH_GRAFANA)
|
||||
BUILD_IN_SOURCE 1
|
||||
INSTALL_COMMAND cp <SOURCE_DIR>/_output/jb <INSTALL_DIR>)
|
||||
|
||||
ExternalProject_Add(jsonnet
|
||||
GIT_REPOSITORY "https://github.com/google/go-jsonnet.git"
|
||||
GIT_TAG "v0.18.0"
|
||||
GIT_SHALLOW TRUE
|
||||
SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/src
|
||||
CONFIGURE_COMMAND ""
|
||||
DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/src
|
||||
BUILD_COMMAND make build
|
||||
BUILD_IN_SOURCE 1
|
||||
INSTALL_COMMAND cp <SOURCE_DIR>/_output/jsonnet <INSTALL_DIR>)
|
||||
|
||||
set(CEPH_BUILD_VIRTUALENV $ENV{TMPDIR})
|
||||
if(NOT CEPH_BUILD_VIRTUALENV)
|
||||
include(AddCephTest)
|
||||
|
@ -40,7 +40,7 @@ file, developers should include any necessary changes to the MIB.
|
||||
|
||||
### Building from Jsonnet
|
||||
|
||||
- Install [jsonnet](https://jsonnet.org/)
|
||||
- Install [jsonnet](https://jsonnet.org/) (at least v0.18.0)
|
||||
- By installing the package `jsonnet` in most of the distro and
|
||||
`golang-github-google-jsonnet` in fedora
|
||||
- Install [jsonnet-bundler](https://github.com/jsonnet-bundler/jsonnet-bundler)
|
||||
|
Loading…
Reference in New Issue
Block a user