From: Deepika <dupadhya@redhat.com>
Date: Mon, 5 Jul 2021 14:14:22 +0000 (+0000)
Subject: install-deps.sh: add missing with_jaeger option for ceph.spec mangling
X-Git-Tag: v17.1.0~1325^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd0ca9dcb85f317555d7306c2bf7beab2cb54406;p=ceph.git

install-deps.sh: add missing with_jaeger option for ceph.spec mangling

Signed-off-by: Deepika <dupadhya@redhat.com>
---

diff --git a/install-deps.sh b/install-deps.sh
index af9ac2657cf8..b2b40fbd8e9f 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -30,6 +30,8 @@ function munge_ceph_spec_in {
     shift
     local for_make_check=$1
     shift
+    local with_jaeger=$1
+    shift
     local OUTFILE=$1
     sed -e 's/@//g' < ceph.spec.in > $OUTFILE
     # http://rpm.org/user_doc/conditional_builds.html
@@ -385,7 +387,7 @@ else
                 fi
                 ;;
         esac
-        munge_ceph_spec_in $with_seastar $with_zbd $for_make_check $DIR/ceph.spec
+        munge_ceph_spec_in $with_seastar $with_zbd $for_make_check $with_jaeger $DIR/ceph.spec
         # for python3_pkgversion macro defined by python-srpm-macros, which is required by python3-devel
         $SUDO dnf install -y python3-devel
         $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
@@ -397,7 +399,7 @@ else
         echo "Using zypper to install dependencies"
         zypp_install="zypper --gpg-auto-import-keys --non-interactive install --no-recommends"
         $SUDO $zypp_install systemd-rpm-macros rpm-build || exit 1
-        munge_ceph_spec_in $with_seastar false $for_make_check $DIR/ceph.spec
+        munge_ceph_spec_in $with_seastar false $for_make_check $with_jaeger $DIR/ceph.spec
         $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
         ;;
     *)