From: Kefu Chai Date: Thu, 11 Apr 2019 16:11:42 +0000 (+0800) Subject: install-deps.sh: install '*rpm-macros' X-Git-Tag: v14.2.1~36^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27544%2Fhead;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) --- diff --git a/install-deps.sh b/install-deps.sh index b1a5219cfca5..0a21dfcb6356 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -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