ceph-*-build: enable crimson build dependencies

if $FLAVOR is crimson, crimson specific build dependencies should be
installed, otherwise we could have following failure when trying to
build crimson flavor of ceph packages:

error: Failed build dependencies:
	fmt-devel is needed by ceph-2:16.0.0-1456.g311da94.el8.x86_64

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index 56618f20b2485a75a9a21bf3348a05d08a6287ab..26ce8927893044da4153cf6ec029184b4582cd0e 100644 (file)
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -94,6 +94,11 @@ fi
 
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
 
+if [ "$FLAVOR" = "crimson" ]; then
+    # enable more build depends required by crimson
+    sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $DIR/ceph.spec
+esac
+
 # Make sure we have all the rpm macros installed and at the latest version
 # before installing the dependencies, python3-devel requires the
 # python-rpm-macro we use for identifying the python related dependencies

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index 2bd5096166800f904323a5c38dcca0e23d7b80c9..7c54aa8bc5c52baca5ae37fe0cb759776c19a55d 100644 (file)
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -95,6 +95,11 @@ fi
 
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
 
+if [ "$FLAVOR" = "crimson" ]; then
+    # enable more build depends required by crimson
+    sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $DIR/ceph.spec
+esac
+
 # before installing the dependencies, python3-devel requires the
 # python-rpm-macro we use for identifying the python related dependencies
 $SUDO yum install -y python3-devel

diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index 2bd5096166800f904323a5c38dcca0e23d7b80c9..7c54aa8bc5c52baca5ae37fe0cb759776c19a55d 100644 (file)
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -95,6 +95,11 @@ fi
 
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
 
+if [ "$FLAVOR" = "crimson" ]; then
+    # enable more build depends required by crimson
+    sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $DIR/ceph.spec
+esac
+
 # before installing the dependencies, python3-devel requires the
 # python-rpm-macro we use for identifying the python related dependencies
 $SUDO yum install -y python3-devel