Remove libcrush from packaging

This removes libcrush from the packaging system, now that it's been
merged into libcommon.

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 4bb9d407e75cff13cf1c1197c6bb1e6f4ef2004f..66884c854994012d74ff018168975c5df1e0a13b 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -160,7 +160,6 @@ fi
 %{_bindir}/cdebugpack
 %{_initrddir}/ceph
 %{_libdir}/libceph.so.*
-%{_libdir}/libcrush.so.*
 %{_libdir}/librados.so.*
 %{_libdir}/librbd.so.*
 %{_libdir}/rados-classes/libcls_rbd.so.*
@@ -219,7 +218,6 @@ fi
 %{_includedir}/rbd/librbd.h
 %{_includedir}/rbd/librbd.hpp
 %{_libdir}/libceph.so
-%{_libdir}/libcrush.so
 %{_libdir}/librados.so
 %{_libdir}/librbd.so
 %{_libdir}/rados-classes/libcls_rbd.so

diff --git a/debian/.gitignore b/debian/.gitignore
index 4029fff218bad49338084157e70b08a56a6f74f8..4f1e9975b63dff1bc9a8ff9509e6a786124ef7e8 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -13,9 +13,6 @@
 /libceph1-dbg
 /libceph1-dev
 /libceph1
-/libcrush1-dbg
-/libcrush1-dev
-/libcrush1
 /librados2-dbg
 /librados2-dev
 /librados2

diff --git a/debian/control b/debian/control
index d19fab23e6b747fd1ec4603925fd4d40a2d8e0e3..6815dce3ab1da32b17f8aceb02f37600ebc1360b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Standards-Version: 3.9.1
 Package: ceph
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libedit2, hdparm, binutils
-Recommends: ceph-client-tools, ceph-fuse, libceph1, librados2, librbd1, libcrush1, btrfs-tools
+Recommends: ceph-client-tools, ceph-fuse, libceph1, librados2, librbd1, btrfs-tools
 Description: distributed storage and file system
  Ceph is a distributed storage and network file system designed to provide
  excellent performance, reliability, and scalability.
@@ -82,67 +82,12 @@ Description: debugging symbols for ceph-client-tools
  .
  This package contains the debugging symbols for ceph-client-tools.
 
-Package: libcrush1
-Conflicts: libcrush
-Replaces: libcrush
-Architecture: linux-any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: CRUSH placement algorithm
- CRUSH is a pseudo-random hash-like algorithm for mapping inputs to
- a changing hierarchy of devices without a centralized directory.  It was
- originally designed for mapping data objects to storage servers, although it
- may be useful in other domains.  Because large systems are inherently
- dynamic, CRUSH is designed to facilitate the addition and removal of devices
- while minimizing unnecessary object movement.  The algorithm accommodates a
- wide variety of data replication and reliability mechanisms and distributes
- data in terms of user-defined policies that enforce separation of replicas
- across failure domains.
-
-Package: libcrush1-dbg
-Architecture: linux-any
-Section: debug
-Priority: extra
-Depends: libcrush1 (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for libcrush1
- CRUSH is a pseudo-random hash-like algorithm for mapping inputs to
- a changing hierarchy of devices without a centralized directory.  It was
- originally designed for mapping data objects to storage servesr, although it
- may be useful in other domains.  Because large systems are inherently
- dynamic, CRUSH is designed to facilitate the addition and removal of devices
- while minimizing unnecessary object movement.  The algorithm accommodates a
- wide variety of data replication and reliability mechanisms and distributes
- data in terms of user-defined policies that enforce separation of replicas
- across failure domains.
- .
- This package contains debugging symbols for libcrush.
-
-Package: libcrush-dev
-Architecture: linux-any
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1 (= ${binary:Version})
-Conflicts: libcrush1-dev
-Replaces: libcrush1-dev
-Description: CRUSH mapping algorithm (development files)
- CRUSH is a pseudo-random hash-like algorithm for mapping inputs to
- a changing hierarchy of devices without a centralized directory.  It was
- originally designed for mapping data objects to storage servesr, although it
- may be useful in other domains.  Because large systems are inherently
- dynamic, CRUSH is designed to facilitate the addition and removal of devices
- while minimizing unnecessary object movement.  The algorithm accommodates a
- wide variety of data replication and reliability mechanisms and distributes
- data in terms of user-defined policies that enforce separation of replicas
- across failure domains.
- .
- This package contains development files needed for building applications that
- link against libcrush.
-
 Package: librados2
 Conflicts: librados, librados1
 Replaces: librados, librados1
 Architecture: linux-any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: RADOS distributed object store client library
  RADOS is a reliable, autonomic distributed object storage cluster
  developed as part of the Ceph distributed storage system.  This is a
@@ -222,7 +167,7 @@ Conflicts: libceph
 Replaces: libceph
 Architecture: linux-any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcrush1
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Ceph distributed file system client library
  Ceph is a distributed network file system designed to provide
  excellent performance, reliability, and scalability.  This is a

diff --git a/debian/libcrush-dev.install b/debian/libcrush-dev.install
deleted file mode 100644 (file)
index e2d180e..0000000
--- a/debian/libcrush-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/libcrush.so
-usr/lib/libcrush.a
-usr/lib/libcrush.la
-usr/include/crush/hash.h
-usr/include/crush/types.h
-usr/include/crush/mapper.h
-usr/include/crush/crush.h

diff --git a/debian/libcrush1.install b/debian/libcrush1.install
deleted file mode 100644 (file)
index 192b545..0000000
--- a/debian/libcrush1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libcrush.so.*
-

diff --git a/debian/rules b/debian/rules
index 7eb4520ac11cb4c0d2dc13b83e0d254eec327299..fe29bce837ad5d39471ff0aa18de148d5f1d678f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -104,7 +104,6 @@ binary-arch: build install
        dh_strip -pceph --dbg-package=ceph-dbg -k --exclude=libcls_
        dh_strip -pceph-fuse --dbg-package=ceph-fuse-dbg
        dh_strip -pceph-client-tools --dbg-package=ceph-client-tools-dbg
-       dh_strip -plibcrush1 --dbg-package=libcrush1-dbg
        dh_strip -plibrados2 --dbg-package=librados2-dbg
        dh_strip -plibrbd1 --dbg-package=librbd1-dbg
        dh_strip -plibceph1 --dbg-package=libceph1-dbg

diff --git a/src/Makefile.am b/src/Makefile.am
index 3611af030854877e18cc08588a248214cdd629fb..8eed850291d453de842d4225609955bf332e0453 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -581,7 +581,6 @@ clean-local:
 libcommon_a_SOURCES = \
        ./ceph_ver.c \
        $(libcommon_files)
-       $(crush_files)
 
 libcommon_a_CFLAGS= ${CRYPTO_CFLAGS} ${AM_CFLAGS}
 libcommon_a_CXXFLAGS= ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}