From: Kefu Chai Date: Thu, 11 Apr 2019 16:11:42 +0000 (+0800) Subject: install-deps.sh: install '*rpm-macros' X-Git-Tag: v12.2.13~255^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5d3a3b4b6851ba62051d14c26702a899d0abed1;p=ceph.git install-deps.sh: install '*rpm-macros' 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 (cherry picked from commit 087ea813a061a1d6858aeae57950e90965f4ae15) Conflicts: install-deps.sh: trivial resolution --- diff --git a/install-deps.sh b/install-deps.sh index e73e05f6b53..4f1ef9172e4 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -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 ;;