ceph-build: Install latest rpm macros

We should make sure that all the rpm and srpm macros are installed and
at the latest version before installing the build dependencies.

Otherwise, the macros can get updated and we might not get all the
dependencies installed with yum-builddep.

Signed-off-by: Boris Ranto <branto@redhat.com>

diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm
index d5e50fb6db3f5a155f11a78d780ea6879549bf91..649279a36ec5c5e0435e97e3d03b899d1edcbbce 100644 (file)
--- a/ceph-build/build/setup_rpm
+++ b/ceph-build/build/setup_rpm
@@ -38,6 +38,10 @@ elif [ "$ARCH" = arm64 ]; then
     $SUDO yum-config-manager --enable centos-sclo-rh-testing
 fi
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
+
+# Make sure we have all the rpm macros installed and at the latest version before installing the dependencies
+$SUDO yum install -y \*rpm-macros
+
 $SUDO yum-builddep -y $DIR/ceph.spec
 
 BRANCH=`branch_slash_filter $BRANCH`

diff --git a/ceph-dev-build/build/setup_rpm b/ceph-dev-build/build/setup_rpm
index ae0b5e3073b53543575c4cd44914cb031c68cc2a..921021742fdff793a9f5b86c2b3aa135f93b4a06 100644 (file)
--- a/ceph-dev-build/build/setup_rpm
+++ b/ceph-dev-build/build/setup_rpm
@@ -38,6 +38,10 @@ elif [ "$ARCH" = arm64 ]; then
     $SUDO yum-config-manager --enable centos-sclo-rh-testing
 fi
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
+
+# Make sure we have all the rpm macros installed and at the latest version before installing the dependencies
+$SUDO yum install -y \*rpm-macros
+
 $SUDO yum-builddep -y $DIR/ceph.spec
 
 BRANCH=`branch_slash_filter $BRANCH`

diff --git a/ceph-dev-new-build/build/setup_rpm b/ceph-dev-new-build/build/setup_rpm
index ae0b5e3073b53543575c4cd44914cb031c68cc2a..921021742fdff793a9f5b86c2b3aa135f93b4a06 100644 (file)
--- a/ceph-dev-new-build/build/setup_rpm
+++ b/ceph-dev-new-build/build/setup_rpm
@@ -38,6 +38,10 @@ elif [ "$ARCH" = arm64 ]; then
     $SUDO yum-config-manager --enable centos-sclo-rh-testing
 fi
 sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
+
+# Make sure we have all the rpm macros installed and at the latest version before installing the dependencies
+$SUDO yum install -y \*rpm-macros
+
 $SUDO yum-builddep -y $DIR/ceph.spec
 
 BRANCH=`branch_slash_filter $BRANCH`