From 100a0fb51f547856433af8ff8e28d1d5e769e82d Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Mon, 8 Apr 2019 19:27:34 +0200 Subject: [PATCH] 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 --- ceph-build/build/setup_rpm | 4 ++++ ceph-dev-build/build/setup_rpm | 4 ++++ ceph-dev-new-build/build/setup_rpm | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/ceph-build/build/setup_rpm b/ceph-build/build/setup_rpm index d5e50fb6..649279a3 100644 --- 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 ae0b5e30..92102174 100644 --- 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 ae0b5e30..92102174 100644 --- 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` -- 2.47.3