]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
install-deps.sh: install '*rpm-macros'
authorKefu Chai <kchai@redhat.com>
Thu, 11 Apr 2019 16:11:42 +0000 (00:11 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 11 Jun 2019 15:44:22 +0000 (23:44 +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)

Conflicts:
install-deps.sh: trivial resolution

install-deps.sh

index e73e05f6b534216117d1970cbee76bf5a5102d40..4f1ef9172e4abc40715c911ca13db70173fd8e82 100755 (executable)
@@ -185,6 +185,7 @@ else
                 ;;
         esac
         munge_ceph_spec_in $DIR/ceph.spec
+        $SUDO $yumdnf install -y \*rpm-macros
         $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
         ! grep -q -i error: $DIR/yum-builddep.out || exit 1
         ;;