]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
install-deps.sh: install '*rpm-macros' 27544/head
authorKefu Chai <kchai@redhat.com>
Thu, 11 Apr 2019 16:11:42 +0000 (00:11 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 12 Apr 2019 11:10:11 +0000 (19:10 +0800)
so `yum-builddep` can have access to the latest macros for preparing the
build dependencies

Fixes: http://tracker.ceph.com/issues/39164
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 087ea813a061a1d6858aeae57950e90965f4ae15)

install-deps.sh

index b1a5219cfca53d5b9a8f90b56eb7d8af236b1f72..0a21dfcb635661fa08bdad17fd7bd6c64d4cee9c 100755 (executable)
@@ -359,6 +359,7 @@ else
                 ;;
         esac
         munge_ceph_spec_in $for_make_check $DIR/ceph.spec
+        $SUDO $yumdnf install -y \*rpm-macros
         $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
         [ ${PIPESTATUS[0]} -ne 0 ] && exit 1
        if [ -n "$dts_ver" ]; then