Merge pull request ceph#8133 from ceph/wip-15145-cephfs-tools

packaging: move cephfs repair tools to ceph-common Reviewed-by: Boris Ranto <[email protected]> Reviewed-by: Ken Dreyer <[email protected]> Reviewed-by: Gregory Farnum <[email protected]> Reviewed-by: Nathan Cutler <[email protected]>
siplabs · Mar 16, 2016 · 8be0a35 · 8be0a35
2 parents e9e77c8 + ff3f0f8
commit 8be0a35
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -266,6 +266,7 @@ Summary:	Ceph Common
 Group:		System Environment/Base
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
+Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
 Requires:	python-rados = %{epoch}:%{version}-%{release}
 Requires:	python-rbd = %{epoch}:%{version}-%{release}
 Requires:	python-cephfs = %{epoch}:%{version}-%{release}
@@ -974,6 +975,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ceph-rbdnamer
 %{_bindir}/ceph-syn
 %{_bindir}/ceph-crush-location
+%{_bindir}/cephfs-data-scan
+%{_bindir}/cephfs-journal-tool
+%{_bindir}/cephfs-table-tool
 %{_bindir}/rados
 %{_bindir}/rbd
 %{_bindir}/rbd-replay
@@ -1050,9 +1054,6 @@ fi
 #################################################################################
 %files mds
 %{_bindir}/ceph-mds
-%{_bindir}/cephfs-journal-tool
-%{_bindir}/cephfs-table-tool
-%{_bindir}/cephfs-data-scan
 %{_mandir}/man8/ceph-mds.8*
 %if 0%{?_with_systemd}
 %{_unitdir}/[email protected]

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
@@ -7,6 +7,9 @@ usr/bin/ceph-dencoder
 usr/bin/ceph-rbdnamer
 usr/bin/ceph-syn
 usr/bin/ceph-crush-location
+usr/bin/cephfs-data-scan
+usr/bin/cephfs-journal-tool
+usr/bin/cephfs-table-tool
 usr/bin/rados
 usr/bin/rbd
 usr/bin/rbdmap

diff --git a/debian/ceph-mds.install b/debian/ceph-mds.install
@@ -1,5 +1,2 @@
 usr/bin/ceph-mds
-usr/bin/cephfs-journal-tool
-usr/bin/cephfs-table-tool
-usr/bin/cephfs-data-scan
 usr/share/man/man8/ceph-mds.8