mirror of https://github.com/ceph/ceph
debian, install-deps.sh: use Build-Profiles to optionally build debian libjaeger
library * use pkg.ceph.jaeger for debian optional pkgs remove mangling needing install-deps, instead use, buildProfileSpec feature introduced for debian. https://wiki.debian.org/BuildProfileSpec * check and * set extraopts in debian/rules using pkg.ceph.jaeger see: https://github.com/ceph/ceph/pull/38783#discussion_r662995612 * cleanup libjaeger.install mangling from CMakeLists Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
This commit is contained in:
parent
4e0b4da1a2
commit
52fc62520f
|
@ -8,7 +8,7 @@ Maintainer: Ceph Maintainers <ceph-maintainers@lists.ceph.com>
|
|||
Uploaders: Ken Dreyer <kdreyer@redhat.com>,
|
||||
Alfredo Deza <adeza@redhat.com>,
|
||||
Build-Depends: automake,
|
||||
# Jaeger bison,
|
||||
bison <pkg.ceph.jaeger>,
|
||||
cmake (>= 3.10.2),
|
||||
cpio,
|
||||
cryptsetup-bin | cryptsetup,
|
||||
|
@ -18,7 +18,7 @@ Build-Depends: automake,
|
|||
dh-exec,
|
||||
dh-python,
|
||||
dh-systemd,
|
||||
# Jaeger flex,
|
||||
flex <pkg.ceph.jaeger>,
|
||||
git,
|
||||
gperf,
|
||||
g++ (>= 7),
|
||||
|
@ -35,7 +35,7 @@ Build-Depends: automake,
|
|||
libcap-ng-dev,
|
||||
libcunit1-dev,
|
||||
libcurl4-openssl-dev,
|
||||
# Jaeger libevent-dev,
|
||||
libevent-dev <pkg.ceph.jaeger>,
|
||||
libexpat1-dev,
|
||||
libffi-dev [!amd64] <pkg.ceph.check>,
|
||||
libfmt-dev (>= 6.1.2),
|
||||
|
@ -78,7 +78,7 @@ Build-Depends: automake,
|
|||
libyaml-cpp-dev <pkg.ceph.crimson>,
|
||||
lsb-release,
|
||||
ninja-build <pkg.ceph.check>,
|
||||
# Jaeger nlohmann-json-dev | nlohmann-json3-dev,
|
||||
nlohmann-json3-dev <pkg.ceph.jaeger>,
|
||||
parted,
|
||||
patch,
|
||||
pkg-config,
|
||||
|
@ -991,6 +991,7 @@ Architecture: linux-any
|
|||
Section: libs
|
||||
Depends: ${misc:Depends},
|
||||
${shlibs:Depends},
|
||||
Build-Profiles: <pkg.ceph.jaeger>
|
||||
Description: This package provides libraries needed for distributed tracing for Ceph.
|
||||
|
||||
Package: ceph-test
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#usr/lib/libopentracing.so.*
|
||||
#usr/lib/libjaegertracing.so.*
|
||||
#usr/lib/libthrift.so.*
|
||||
usr/lib/libopentracing.so.*
|
||||
usr/lib/libjaegertracing.so.*
|
||||
usr/lib/libthrift.so.*
|
||||
usr/lib/libyaml-cpp.so*
|
||||
|
|
|
@ -16,6 +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
|
||||
|
||||
extraopts += -DWITH_OCF=ON -DWITH_LTTNG=ON
|
||||
extraopts += -DWITH_MGR_DASHBOARD_FRONTEND=OFF
|
||||
|
|
|
@ -353,6 +353,9 @@ else
|
|||
if $with_seastar; then
|
||||
build_profiles+=",pkg.ceph.crimson"
|
||||
fi
|
||||
if $with_jaeger; then
|
||||
build_profiles+=",pkg.ceph.jaeger"
|
||||
fi
|
||||
$SUDO env DEBIAN_FRONTEND=noninteractive mk-build-deps \
|
||||
--build-profiles "${build_profiles#,}" \
|
||||
--install --remove \
|
||||
|
|
Loading…
Reference in New Issue