RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-18 05:15:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

install-deps: make jaeger package install default, removes with_jaeger

Browse Source 
flag

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>
This commit is contained in:
Deepika Upadhyay 2022-02-01 16:48:18 +05:30 committed by Omri Zeneva
parent bee4d993fb
commit 028751bce6
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
install-deps.sh
View File

@ -34,17 +34,12 @@ function munge_ceph_spec_in {
shift shift
local for_make_check=$1 local for_make_check=$1
shift shift
local with_jaeger=$1
shift
local OUTFILE=$1 local OUTFILE=$1
sed -e 's/@//g' < ceph.spec.in > $OUTFILE sed -e 's/@//g' < ceph.spec.in > $OUTFILE
# http://rpm.org/user_doc/conditional_builds.html # http://rpm.org/user_doc/conditional_builds.html
if $with_seastar; then if $with_seastar; then
sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $OUTFILE sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $OUTFILE
fi fi
if $with_jaeger; then
sed -i -e 's/%bcond_with jaeger/%bcond_without jaeger/g' $OUTFILE
fi
if $with_zbd; then if $with_zbd; then
sed -i -e 's/%bcond_with zbd/%bcond_without zbd/g' $OUTFILE sed -i -e 's/%bcond_with zbd/%bcond_without zbd/g' $OUTFILE
fi fi
@ -63,10 +58,6 @@ function munge_debian_control {
grep -v babeltrace debian/control > $control grep -v babeltrace debian/control > $control
;; ;;
esac esac
if $with_jaeger; then
sed -i -e 's/^# Jaeger[[:space:]]//g' $control
sed -i -e 's/^# Crimson libyaml-cpp-dev,/d' $control
fi
echo $control echo $control
} }
@ -316,7 +307,6 @@ if [ x$(uname)x = xFreeBSDx ]; then
exit exit
else else
[ $WITH_SEASTAR ] && with_seastar=true || with_seastar=false [ $WITH_SEASTAR ] && with_seastar=true || with_seastar=false
[ $WITH_JAEGER ] && with_jaeger=true || with_jaeger=false
[ $WITH_ZBD ] && with_zbd=true || with_zbd=false [ $WITH_ZBD ] && with_zbd=true || with_zbd=false
[ $WITH_PMEM ] && with_pmem=true || with_pmem=false [ $WITH_PMEM ] && with_pmem=true || with_pmem=false
[ $WITH_RADOSGW_MOTR ] && with_rgw_motr=true || with_rgw_motr=false [ $WITH_RADOSGW_MOTR ] && with_rgw_motr=true || with_rgw_motr=false
@ -368,9 +358,6 @@ else
if $with_seastar; then if $with_seastar; then
build_profiles+=",pkg.ceph.crimson" build_profiles+=",pkg.ceph.crimson"
fi fi
if $with_jaeger; then
build_profiles+=",pkg.ceph.jaeger"
fi
in_jenkins && cat <<EOF in_jenkins && cat <<EOF
CI_DEBUG: for_make_check=$for_make_check CI_DEBUG: for_make_check=$for_make_check
@ -435,7 +422,7 @@ EOF
fi fi
;; ;;
esac esac
munge_ceph_spec_in $with_seastar $with_zbd $for_make_check $with_jaeger $DIR/ceph.spec munge_ceph_spec_in $with_seastar $with_zbd $for_make_check $DIR/ceph.spec
# for python3_pkgversion macro defined by python-srpm-macros, which is required by python3-devel # for python3_pkgversion macro defined by python-srpm-macros, which is required by python3-devel
$SUDO dnf install -y python3-devel $SUDO dnf install -y python3-devel
$SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
@ -455,7 +442,7 @@ EOF
echo "Using zypper to install dependencies" echo "Using zypper to install dependencies"
zypp_install="zypper --gpg-auto-import-keys --non-interactive install --no-recommends" zypp_install="zypper --gpg-auto-import-keys --non-interactive install --no-recommends"
$SUDO $zypp_install systemd-rpm-macros rpm-build || exit 1 $SUDO $zypp_install systemd-rpm-macros rpm-build || exit 1
munge_ceph_spec_in $with_seastar false $for_make_check $with_jaeger $DIR/ceph.spec munge_ceph_spec_in $with_seastar false $for_make_check $DIR/ceph.spec
$SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1 $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
;; ;;
*) *)