diff options
| author | Nathan Cutler <ncutler@suse.com> | 2016-02-29 17:29:46 +0100 |
|---|---|---|
| committer | Nathan Cutler <ncutler@suse.com> | 2016-02-29 17:36:39 +0100 |
| commit | 5083980f4619bf282dfecde5078f1a73a2ed562a (patch) | |
| tree | b7ff5e11144a7bc9903ddbc467e8761a06a9ee36 | |
| parent | packaging: pkg_resources.py runtime dependency (diff) | |
| download | ceph-5083980f4619bf282dfecde5078f1a73a2ed562a.tar.xz ceph-5083980f4619bf282dfecde5078f1a73a2ed562a.zip | |
packaging: rados-classes libraries in ceph-base
Drop duplicate rados-classes libraries from ceph-osd and align the RPM
packaging with Debian by using a wildcard to package everything that
autotools puts in the rados-classes directory.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
| -rw-r--r-- | ceph.spec.in | 28 | ||||
| -rw-r--r-- | debian/ceph-base.install | 1 | ||||
| -rw-r--r-- | debian/ceph-osd.install | 1 |
3 files changed, 2 insertions, 28 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index 37a895ea2a1..99a38519068 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -883,21 +883,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/ceph %{_libexecdir}/ceph/ceph_common.sh %dir %{_libdir}/rados-classes -%{_libdir}/rados-classes/libcls_cephfs.so* -%{_libdir}/rados-classes/libcls_rbd.so* -%{_libdir}/rados-classes/libcls_hello.so* -%{_libdir}/rados-classes/libcls_numops.so* -%{_libdir}/rados-classes/libcls_rgw.so* -%{_libdir}/rados-classes/libcls_lock.so* -%{_libdir}/rados-classes/libcls_kvs.so* -%{_libdir}/rados-classes/libcls_refcount.so* -%{_libdir}/rados-classes/libcls_log.so* -%{_libdir}/rados-classes/libcls_replica_log.so* -%{_libdir}/rados-classes/libcls_statelog.so* -%{_libdir}/rados-classes/libcls_timeindex.so* -%{_libdir}/rados-classes/libcls_user.so* -%{_libdir}/rados-classes/libcls_version.so* -%{_libdir}/rados-classes/libcls_journal.so* +%{_libdir}/rados-classes/* %dir %{_libdir}/ceph %dir %{_libdir}/ceph/erasure-code %{_libdir}/ceph/erasure-code/libec_*.so* @@ -1152,18 +1138,6 @@ fi %{_sbindir}/ceph-disk %{_sbindir}/ceph-disk-udev %{_libexecdir}/ceph/ceph-osd-prestart.sh -%dir %{_libdir}/rados-classes -%{_libdir}/rados-classes/libcls_rbd.so* -%{_libdir}/rados-classes/libcls_hello.so* -%{_libdir}/rados-classes/libcls_rgw.so* -%{_libdir}/rados-classes/libcls_lock.so* -%{_libdir}/rados-classes/libcls_kvs.so* -%{_libdir}/rados-classes/libcls_refcount.so* -%{_libdir}/rados-classes/libcls_log.so* -%{_libdir}/rados-classes/libcls_replica_log.so* -%{_libdir}/rados-classes/libcls_statelog.so* -%{_libdir}/rados-classes/libcls_user.so* -%{_libdir}/rados-classes/libcls_version.so* %{_udevrulesdir}/60-ceph-partuuid-workaround.rules %{_udevrulesdir}/95-ceph-osd.rules %{_mandir}/man8/ceph-clsinfo.8* diff --git a/debian/ceph-base.install b/debian/ceph-base.install index 24fef5fa390..895a50415c9 100644 --- a/debian/ceph-base.install +++ b/debian/ceph-base.install @@ -8,6 +8,7 @@ usr/bin/monmaptool usr/bin/osdmaptool usr/lib/ceph/ceph_common.sh usr/lib/ceph/erasure-code/* +usr/lib/rados-classes/* usr/share/doc/ceph/sample.ceph.conf usr/share/doc/ceph/sample.fetch_config usr/share/man/man8/ceph-debugpack.8 diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install index 53ab4336a22..fd93b4dba93 100644 --- a/debian/ceph-osd.install +++ b/debian/ceph-osd.install @@ -7,7 +7,6 @@ usr/bin/ceph-objectstore-tool usr/bin/ceph-bluefs-tool usr/bin/ceph_objectstore_bench usr/bin/ceph-osd -usr/lib/rados-classes/* usr/lib/ceph/ceph-osd-prestart.sh usr/share/man/man8/ceph-clsinfo.8 usr/share/man/man8/ceph-disk.8 |