From: Deepika Upadhyay <dupadhya@redhat.com>
Date: Tue, 1 Feb 2022 11:09:44 +0000 (+0530)
Subject: debian: make jaeger package installation as default
X-Git-Tag: v18.0.0~789^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bee4d993fb67a8240a6ccdc8f6f7872b0e39236a;p=ceph.git

debian: make jaeger package installation as default

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 <dupadhya@redhat.com>
---

diff --git a/debian/control b/debian/control
index f64664e4319a..18986abacaa2 100644
--- a/debian/control
+++ b/debian/control
@@ -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,
-               bison  <pkg.ceph.jaeger>,
+               bison,
                cmake (>= 3.10.2),
                cpio,
                cython3,
@@ -16,7 +16,7 @@ Build-Depends: automake,
                default-jdk,
                dh-exec,
                dh-python,
-               flex  <pkg.ceph.jaeger>,
+               flex,
                git,
                golang,
                gperf,
@@ -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),
@@ -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>,
diff --git a/debian/rules b/debian/rules
index 9f49deabb0e0..96245ae39c81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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