ceph.spec.in, install-deps: sed -i 's/seastar/crimson/'

Signed-off-by: Matan Breizman <mbreizma@redhat.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 2a604e0f9deec51171fa5dfc9d3d6d6dbc841ec6..6bc9b7cd0d608eb4c6fcc981c18e5ebffd17e9b9 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -91,7 +91,7 @@
 %bcond_with lua_packages
 %endif
 %endif
-%bcond_with seastar
+%bcond_with crimson
 %if 0%{?suse_version} || 0%{?openEuler}
 %bcond_with jaeger
 %else
@@ -150,7 +150,7 @@
 %{!?python3_pkgversion: %global python3_pkgversion 3}
 %{!?python3_version_nodots: %global python3_version_nodots 3}
 %{!?python3_version: %global python3_version 3}
-%if 0%{with seastar}
+%if 0%{with crimson}
 %{!?gts_version: %global gts_version 13}
 %else
 %if 0%{?rhel} == 8
@@ -325,7 +325,7 @@ BuildRequires:      xmlstarlet
 BuildRequires: nasm
 BuildRequires: lua-devel
 BuildRequires:  lmdb-devel
-%if 0%{with seastar} || 0%{with jaeger}
+%if 0%{with crimson} || 0%{with jaeger}
 BuildRequires:  yaml-cpp-devel >= 0.6
 %endif
 %if 0%{with amqp_endpoint}
@@ -387,7 +387,7 @@ BuildRequires:  utf8proc-devel
 BuildRequires:  qatlib-devel
 BuildRequires:  qatzip-devel
 %endif
-%if 0%{with seastar}
+%if 0%{with crimson}
 BuildRequires:  c-ares-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  hwloc-devel
@@ -514,7 +514,7 @@ BuildRequires:  redhat-rpm-config
 %if 0%{?openEuler}
 BuildRequires:  openEuler-rpm-config
 %endif
-%if 0%{with seastar}
+%if 0%{with crimson}
 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
 BuildRequires:  cryptopp-devel
 %endif
@@ -943,7 +943,7 @@ Provides:   ceph-test:/usr/bin/ceph-osdomap-tool
 Requires:      ceph-base = %{_epoch_prefix}%{version}-%{release}
 Requires:      sudo
 Requires:      libstoragemgmt
-%if 0%{with seastar}
+%if 0%{with crimson}
 Requires:      protobuf
 %endif
 %if 0%{?weak_deps}
@@ -954,7 +954,7 @@ ceph-osd is the object storage daemon for the Ceph distributed file
 system.  It is responsible for storing objects on a local file system
 and providing access to them over the network.
 
-%if 0%{with seastar}
+%if 0%{with crimson}
 %package crimson-osd
 Summary:       Ceph Object Storage Daemon (crimson)
 %if 0%{?suse_version}
@@ -1431,7 +1431,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="$RPM_LD_FLAGS"
 
-%if 0%{with seastar}
+%if 0%{with crimson}
 # seastar uses longjmp() to implement coroutine. and this annoys longjmp_chk()
 export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g')
 # remove from CFLAGS too because it causes the arrow submodule to fail with:
@@ -1543,7 +1543,7 @@ cmake .. \
     -DWITH_SYSTEM_QATLIB:BOOL=ON \
     -DWITH_SYSTEM_QATZIP:BOOL=ON \
 %endif
-%if 0%{with seastar}
+%if 0%{with crimson}
     -DWITH_CRIMSON:BOOL=ON \
     -DWITH_JAEGER:BOOL=OFF \
 %endif
@@ -1591,7 +1591,7 @@ pushd %{_vpath_builddir}
 rm -f %{buildroot}/%{_sysconfdir}/init.d/ceph
 popd
 
-%if 0%{with seastar}
+%if 0%{with crimson}
 # package crimson-osd with the name of ceph-osd
 install -m 0755 %{buildroot}%{_bindir}/crimson-osd %{buildroot}%{_bindir}/ceph-osd
 %endif
@@ -2364,7 +2364,7 @@ if [ $1 -ge 1 ] ; then
   fi
 fi
 
-%if 0%{with seastar}
+%if 0%{with crimson}
 %files crimson-osd
 %{_bindir}/crimson-osd
 %endif
@@ -2614,7 +2614,7 @@ fi
 %{_bindir}/ceph-debugpack
 %{_bindir}/ceph-dedup-tool
 %{_bindir}/ceph-dedup-daemon
-%if 0%{with seastar}
+%if 0%{with crimson}
 %{_bindir}/crimson-store-nbd
 %endif
 %{_mandir}/man8/ceph-debugpack.8*

diff --git a/install-deps.sh b/install-deps.sh
index 54bacb6567a8a2a13a4e88421fe894e1fbcd8791..1cb05fe958f0f35daae1c8be7b8f87f4aaf26a42 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -32,15 +32,15 @@ ARCH=$(uname -m)
 
 
 function munge_ceph_spec_in {
-    local with_seastar=$1
+    local with_crimson=$1
     shift
     local for_make_check=$1
     shift
     local OUTFILE=$1
     sed -e 's/@//g' < ceph.spec.in > $OUTFILE
     # http://rpm.org/user_doc/conditional_builds.html
-    if $with_seastar; then
-        sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $OUTFILE
+    if $with_crimson; then
+        sed -i -e 's/%bcond_with crimson/%bcond_without crimson/g' $OUTFILE
     fi
     if $for_make_check; then
         sed -i -e 's/%bcond_with make_check/%bcond_without make_check/g' $OUTFILE
@@ -372,7 +372,7 @@ if [ x$(uname)x = xFreeBSDx ]; then
         sysutils/fusefs-libs \
     exit
 else
-    [ $WITH_CRIMSON ] && with_seastar=true || with_seastar=false
+    [ $WITH_CRIMSON ] && with_crimson=true || with_crimson=false
     [ $WITH_PMEM ] && with_pmem=true || with_pmem=false
     source /etc/os-release
     case "$ID" in
@@ -435,7 +435,7 @@ else
         if $for_make_check; then
             build_profiles+=",pkg.ceph.check"
         fi
-        if $with_seastar; then
+        if $with_crimson; then
             build_profiles+=",pkg.ceph.crimson"
         fi
         if $with_pmem; then
@@ -443,7 +443,7 @@ else
         fi
 
         ci_debug "for_make_check=$for_make_check"
-        ci_debug "with_seastar=$with_seastar"
+        ci_debug "with_crimson=$with_crimson"
         ci_debug "with_jaeger=$with_jaeger"
         ci_debug "build_profiles=$build_profiles"
         ci_debug "Now running 'mk-build-deps' and installing ceph-build-deps package"
@@ -502,7 +502,7 @@ else
         if [ "$INSTALL_EXTRA_PACKAGES" ]; then
             $SUDO dnf install -y $INSTALL_EXTRA_PACKAGES
         fi
-        munge_ceph_spec_in $with_seastar $for_make_check $DIR/ceph.spec
+        munge_ceph_spec_in $with_crimson $for_make_check $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
@@ -520,7 +520,7 @@ else
         if [ "$INSTALL_EXTRA_PACKAGES" ]; then
             $SUDO $zypp_install $INSTALL_EXTRA_PACKAGES
         fi
-        munge_ceph_spec_in $with_seastar $for_make_check $DIR/ceph.spec
+        munge_ceph_spec_in $with_crimson $for_make_check $DIR/ceph.spec
         $SUDO $zypp_install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1
         ;;
     *)