From 29a932c2924daeaa2474da4c3df8cc6cabf4d7da Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Wed, 16 Dec 2020 18:17:01 +0530 Subject: [PATCH] install-deps.sh: add with_jaeger options for installing it's dependencies * if WITH_JAEGER flag is specified, install-deps should mangle and update debian/control + ceph.spec the way we do for adding crimson dependencies with WITH_SEASTAR flag. Signed-off-by: Deepika Upadhyay --- install-deps.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install-deps.sh b/install-deps.sh index 9f9c407dbb5d..d92e80d35475 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -36,6 +36,9 @@ function munge_ceph_spec_in { if $with_seastar; then sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $OUTFILE fi + if $with_jaeger; then + sed -i -e 's/%bcond_with jaeger/%bcond_without jaeger/g' $OUTFILE + fi if $with_zbd; then sed -i -e 's/%bcond_with zbd/%bcond_without zbd/g' $OUTFILE fi @@ -61,6 +64,10 @@ function munge_debian_control { if $with_seastar; then sed -i -e 's/^# Crimson[[:space:]]//g' $control fi + if $with_jaeger; then + sed -i -e 's/^# Jaeger[[:space:]]//g' $control + sed -i -e 's/^# Crimson libyaml-cpp-dev,/d' $control + fi if $for_make_check; then sed -i 's/^# Make-Check[[:space:]]/ /g' $control fi @@ -272,6 +279,7 @@ if [ x$(uname)x = xFreeBSDx ]; then exit else [ $WITH_SEASTAR ] && with_seastar=true || with_seastar=false + [ $WITH_JAEGER ] && with_jaeger=true || with_jaeger=false [ $WITH_ZBD ] && with_zbd=true || with_zbd=false source /etc/os-release case "$ID" in -- 2.47.3