From bd0ca9dcb85f317555d7306c2bf7beab2cb54406 Mon Sep 17 00:00:00 2001 From: Deepika Date: Mon, 5 Jul 2021 14:14:22 +0000 Subject: [PATCH] install-deps.sh: add missing with_jaeger option for ceph.spec mangling Signed-off-by: Deepika --- install-deps.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index af9ac2657cf87..b2b40fbd8e9f2 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 ;; *) -- 2.39.5