Skip to content

Commit

Permalink
debian: make jaeger package installation as default
Browse files Browse the repository at this point in the history
jaeger opentelemetry deps that will be installed by default now:
libyaml-dev  > 0.6
libthrift-dev (thift deps: libevent-dev, bison, flex, boost(we use ceph compiled boost))
nlohmann-json3-dev

removes:
pkg.ceph.jaeger build package optional option

Signed-off-by: Deepika Upadhyay <[email protected]>
  • Loading branch information
Deepika Upadhyay authored and Omri Zeneva committed May 17, 2022
1 parent 7be8be6 commit bee4d99
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
10 changes: 5 additions & 5 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ Maintainer: Ceph Maintainers <[email protected]>
Uploaders: Ken Dreyer <[email protected]>,
Alfredo Deza <[email protected]>,
Build-Depends: automake,
bison <pkg.ceph.jaeger>,
bison,
cmake (>= 3.10.2),
cpio,
cython3,
debhelper (>= 10),
default-jdk,
dh-exec,
dh-python,
flex <pkg.ceph.jaeger>,
flex,
git,
golang,
gperf,
Expand All @@ -37,7 +37,7 @@ Build-Depends: automake,
libcap-ng-dev,
libcunit1-dev,
libcurl4-openssl-dev,
libevent-dev <pkg.ceph.jaeger>,
libevent-dev,
libexpat1-dev,
libffi-dev [!amd64] <pkg.ceph.check>,
libfmt-dev (>= 6.1.2),
Expand Down Expand Up @@ -72,14 +72,14 @@ Build-Depends: automake,
librdkafka-dev,
luarocks,
libthrift-dev (>= 0.13.0),
libyaml-cpp-dev (>= 0.6) <pkg.ceph.crimson> <pkg.ceph.jaeger>,
libyaml-cpp-dev (>= 0.6),
libzstd-dev <pkg.ceph.check>,
libxmlsec1 <pkg.ceph.check>,
libxmlsec1-nss <pkg.ceph.check>,
libxmlsec1-openssl <pkg.ceph.check>,
libxmlsec1-dev <pkg.ceph.check>,
ninja-build,
nlohmann-json3-dev <pkg.ceph.jaeger>,
nlohmann-json3-dev,
patch,
pkg-config,
prometheus <pkg.ceph.check>,
Expand Down
6 changes: 1 addition & 5 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@ ifeq (,$(findstring WITH_SEASTAR,$(CEPH_EXTRA_CMAKE_ARGS)))
else
export CEPH_OSD_BASENAME = crimson-osd
endif
ifeq ($(filter pkg.ceph.jaeger,$(DEB_BUILD_PROFILES)),)
extraopts += -DWITH_JAEGER=OFF
else
extraopts += -DWITH_JAEGER=ON
endif
ifneq ($(filter pkg.ceph.arrow,$(DEB_BUILD_PROFILES)),)
extraopts += -DWITH_SYSTEM_ARROW=ON
endif

extraopts += -DWITH_JAEGER=ON
extraopts += -DWITH_SYSTEM_UTF8PROC=ON
extraopts += -DWITH_OCF=ON -DWITH_LTTNG=ON
extraopts += -DWITH_MGR_DASHBOARD_FRONTEND=OFF
Expand Down

0 comments on commit bee4d99

Please sign in to comment.