diff options
| author | Sage Weil <sage@newdream.net> | 2013-02-27 08:43:10 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2013-02-27 08:43:10 -0800 |
| commit | 0449c3ae6981bcac077fe97ef59fa4973d6f98a4 (patch) | |
| tree | 879634b8246c9156466d5256f9b59634518fdcdc | |
| parent | babb32996e4b045f1fa95cd4bffac8f7303325f4 (diff) | |
| parent | f42a63ba1b1ad7a0948b180bef0bb4a947633e98 (diff) | |
| download | ceph-0449c3ae6981bcac077fe97ef59fa4973d6f98a4.tar.gz | |
Merge pull request #79 from dalgaaf/wip-da-leveldb
Some fixes related to switch to system leveldb
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | ceph.spec.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | src/.gitignore | 3 | ||||
| m--------- | src/leveldb | 0 |
7 files changed, 9 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index 4bb068b79f4..88db71c0201 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "ceph-object-corpus"] path = ceph-object-corpus url = git://ceph.com/git/ceph-object-corpus.git -[submodule "src/leveldb"] - path = src/leveldb - url = git://github.com/ceph/leveldb.git [submodule "src/libs3"] path = src/libs3 url = git://github.com/ceph/libs3.git @@ -122,7 +122,7 @@ To build the source code, you must install the following: - libboost-program-options-dev - libboost-thread-dev - libexpat1-dev - +- libleveldb-dev For example: diff --git a/ceph.spec.in b/ceph.spec.in index da05b44e234..6275a7abc09 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -25,7 +25,6 @@ Requires: librbd1 = %{version}-%{release} Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} Requires: python -Requires: leveldb > 1.2 Requires(post): binutils BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ @@ -40,6 +39,7 @@ BuildRequires: libaio-devel BuildRequires: libcurl-devel BuildRequires: libxml2-devel BuildRequires: libuuid-devel +BuildRequires: leveldb-devel > 1.2 ################################################################################# # specific diff --git a/configure.ac b/configure.ac index c7bb3d0515c..b4b729f4f64 100644 --- a/configure.ac +++ b/configure.ac @@ -412,6 +412,8 @@ AC_ARG_WITH([ocf], [with_ocf=no]) AM_CONDITIONAL(WITH_OCF, [ test "$with_ocf" = "yes" ]) +# check is snappy-devel is installed, needed by leveldb +AC_CHECK_LIB([snappy], [snappy_compress], [], [AC_MSG_FAILURE([libsnappy not found])]) # use system leveldb AC_CHECK_LIB([leveldb], [leveldb_open], [], [AC_MSG_FAILURE([libleveldb not found])], [-lsnappy -lpthread]) diff --git a/debian/control b/debian/control index 85c9e1eb5ff..14b51505b4f 100644 --- a/debian/control +++ b/debian/control @@ -6,12 +6,12 @@ Vcs-Git: git://github.com/ceph/ceph.git Vcs-Browser: https://github.com/ceph/ceph Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu> Uploaders: Sage Weil <sage@newdream.net> -Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.34), libboost-thread-dev, libedit-dev, libnss3-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libcurl4-gnutls-dev, libkeyutils-dev, uuid-dev, libaio-dev, python (>= 2.6.6-3~), libxml2-dev, javahelper, default-jdk, junit4, libboost-program-options-dev +Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.34), libboost-thread-dev, libedit-dev, libnss3-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libcurl4-gnutls-dev, libkeyutils-dev, uuid-dev, libaio-dev, python (>= 2.6.6-3~), libxml2-dev, javahelper, default-jdk, junit4, libboost-program-options-dev, libleveldb-dev Standards-Version: 3.9.3 Package: ceph Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python, xfsprogs, gdisk, parted, libleveldb1 (> 1.2) +Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python, xfsprogs, gdisk, parted, libleveldb1 Recommends: ceph-mds, librados2, librbd1, btrfs-tools Description: distributed storage and file system Ceph is a distributed storage system designed to provide excellent diff --git a/src/.gitignore b/src/.gitignore index 6384b7b47ba..664ba4dc947 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -64,3 +64,6 @@ Makefile /testmsgr /test_* /unittest_* + +# old dir, may in use by older branches +/leveldb diff --git a/src/leveldb b/src/leveldb deleted file mode 160000 -Subproject c79c270174307411819ddfdd8c9b671ec4fb69c |