From f934188b6cb95a56fd799ff2806a3f4ce30a9c58 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 9 May 2020 16:20:45 +0800 Subject: [PATCH] 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 --- ceph-build/build/setup_rpm | 5 +++++ ceph-dev-build/build/setup_rpm | 5 +++++ ceph-dev-new-build/build/setup_rpm | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index 56618f20..26ce8927 100644 --- 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 2bd50961..7c54aa8b 100644 --- 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 2bd50961..7c54aa8b 100644 --- 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 -- 2.39.5