RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5841 from ceph/wip-12994-rbd-replay-packaging

Browse Source 
#12994: packaging: move rbd-replay* to ceph-common

Reviewed-by: James Page <jamespage@ubuntu.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Sage Weil 2015-09-16 09:12:16 -04:00
commit 391cfb9f48
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ceph.spec.in
View File

@ -832,6 +832,11 @@ mkdir -p %{_localstatedir}/run/ceph/
%{_bindir}/ceph-crush-location
%{_bindir}/rados
%{_bindir}/rbd
%{_bindir}/rbd-replay
%{_bindir}/rbd-replay-many
%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} >= 1310
%{_bindir}/rbd-replay-prep
%endif
%{_bindir}/ceph-post-file
%{_bindir}/ceph-brag
%{_mandir}/man8/ceph-authtool.8*
@ -843,6 +848,9 @@ mkdir -p %{_localstatedir}/run/ceph/
%{_mandir}/man8/ceph.8*
%{_mandir}/man8/rados.8*
%{_mandir}/man8/rbd.8*
%{_mandir}/man8/rbd-replay.8*
%{_mandir}/man8/rbd-replay-many.8*
%{_mandir}/man8/rbd-replay-prep.8*
%{_datadir}/ceph/known_hosts_drop.ceph.com
%{_datadir}/ceph/id_dsa_drop.ceph.com
%{_datadir}/ceph/id_dsa_drop.ceph.com.pub
@ -1087,14 +1095,6 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
%{_bindir}/ceph-monstore-tool
%{_bindir}/ceph-osdomap-tool
%{_bindir}/ceph-kvstore-tool
%{_mandir}/man8/rbd-replay.8*
%{_mandir}/man8/rbd-replay-many.8*
%{_mandir}/man8/rbd-replay-prep.8*
%{_bindir}/rbd-replay
%{_bindir}/rbd-replay-many
%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} >= 1310
%{_bindir}/rbd-replay-prep
%endif
%dir %{_libdir}/ceph
%{_libdir}/ceph/ceph-monstore-update-crush.sh

2
debian/ceph-common.install vendored
View File

@ -9,6 +9,7 @@ usr/bin/ceph-syn
usr/bin/ceph-crush-location
usr/bin/rados
usr/bin/rbd
usr/bin/rbd-replay*
usr/bin/ceph-post-file
usr/bin/ceph-brag
usr/share/man/man8/ceph-authtool.8
@ -20,6 +21,7 @@ usr/share/man/man8/ceph-post-file.8
usr/share/man/man8/ceph.8
usr/share/man/man8/rados.8
usr/share/man/man8/rbd.8
usr/share/man/man8/rbd-replay*.8
usr/share/ceph/known_hosts_drop.ceph.com
usr/share/ceph/id_dsa_drop.ceph.com
usr/share/ceph/id_dsa_drop.ceph.com.pub

2
debian/ceph-test.install vendored
View File

@ -27,6 +27,4 @@ usr/bin/ceph-monstore-tool
usr/bin/ceph-osdomap-tool
usr/bin/ceph-kvstore-tool
usr/share/java/libcephfs-test.jar
usr/bin/rbd-replay*
usr/share/man/man8/rbd-replay*.8
usr/lib/ceph/ceph-monstore-update-crush.sh

2
debian/control vendored
View File

@ -199,9 +199,11 @@ Depends: librbd1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
Conflicts: ceph-client-tools
Replaces: ceph-client-tools,
ceph (<< 9.0.0-943),
ceph-test (<< 9.0.3-1646),
python-ceph (<< 0.92-1223),
librbd1 (<< 0.92-1238)
Breaks: ceph (<< 9.0.0-943),
ceph-test (<< 9.0.3-1646),
python-ceph (<< 0.92-1223),
librbd1 (<< 0.92-1238)
Suggests: ceph, ceph-mds