diff --git a/debian/control b/debian/control index e894e5028f2..a2abffcc661 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Maintainer: Ceph Maintainers Uploaders: Ken Dreyer , Alfredo Deza , Build-Depends: automake, - bison, +# Jaeger bison, cmake (>= 3.10.2), cpio, cryptsetup-bin | cryptsetup, @@ -19,7 +19,7 @@ Build-Depends: automake, dh-exec, dh-python, dh-systemd, - flex, +# Jaeger flex, git, gperf, g++ (>= 7), @@ -36,7 +36,7 @@ Build-Depends: automake, libcap-ng-dev, libcunit1-dev, libcurl4-openssl-dev, - libevent-dev, +# Jaeger libevent-dev, libexpat1-dev, # Make-Check libffi-dev [!amd64], libfuse-dev, @@ -70,8 +70,9 @@ Build-Depends: automake, # Make-Check libxmlsec1-nss, # Make-Check libxmlsec1-openssl, # Make-Check libxmlsec1-dev, +# Crimson libyaml-cpp-dev, lsb-release, - nlohmann-json-dev | nlohmann-json3-dev, +# Jaeger nlohmann-json-dev | nlohmann-json3-dev, parted, patch, pkg-config, @@ -105,7 +106,7 @@ Build-Depends: automake, # Make-Check xmlstarlet, nasm [amd64], zlib1g-dev, -Built-Using: libyaml-cpp-dev (>= 0.6), +# Jaeger Built-Using: libyaml-cpp-dev (>= 0.6), Standards-Version: 4.4.0 Package: ceph diff --git a/install-deps.sh b/install-deps.sh index 9f9c407dbb5..d92e80d3547 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