]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #26402 from tchaikov/wip-install-deps
authorKefu Chai <tchaikov@gmail.com>
Thu, 21 Feb 2019 03:59:10 +0000 (11:59 +0800)
committerGitHub <noreply@github.com>
Thu, 21 Feb 2019 03:59:10 +0000 (11:59 +0800)
 install-deps.sh: selectively install dependencies

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
1  2 
ceph.spec.in
debian/control
install-deps.sh

diff --cc ceph.spec.in
index d51e27ac0ccea30dfdf683dbe42a154a02598a4b,bbe0ef4d942efde97dd91b0827a63aecd5b24cd5..a20deb267a5fdf6bcf8106a269e45d64253ff2d1
@@@ -186,8 -185,8 +185,9 @@@ BuildRequires:     xfsprog
  BuildRequires:        xfsprogs-devel
  BuildRequires:        xmlstarlet
  BuildRequires:        yasm
 +BuildRequires:  librabbitmq-devel
  %if 0%{with make_check}
+ BuildRequires:  jq
  BuildRequires:        python%{_python_buildid}-bcrypt
  BuildRequires:        python%{_python_buildid}-coverage
  BuildRequires:        python%{_python_buildid}-nose
diff --cc debian/control
Simple merge
diff --cc install-deps.sh
Simple merge