]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
remove libs3 submodule 5428/head
authorSage Weil <sage@redhat.com>
Thu, 30 Jul 2015 17:24:00 +0000 (13:24 -0400)
committerSage Weil <sage@redhat.com>
Thu, 30 Jul 2015 17:24:00 +0000 (13:24 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
.gitmodule_mirrors
.gitmodules
configure.ac
qa/rgw/s3.sh [deleted file]
src/Makefile.am
src/libs3 [deleted submodule]
src/script/dep-report.sh

index 3ffad4abf416e18d145297e779e85015e0dca957..0e10b99a9a601c0e4830b48af22612b549a44746 100644 (file)
@@ -2,7 +2,6 @@
 # Only used by autobuild-ceph.
 ceph-object-corpus git://apt-mirror.front.sepia.ceph.com/ceph-object-corpus.git
 src/civetweb git://apt-mirror.front.sepia.ceph.com/civetweb.git
-src/libs3 git://apt-mirror.front.sepia.ceph.com/libs3.git
 src/mongoose git://apt-mirror.front.sepia.ceph.com/mongoose.git
 src/leveldb git://apt-mirror.front.sepia.ceph.com/leveldb.git
 src/erasure-code/jerasure/jerasure git://apt-mirror.front.sepia.ceph.com/jerasure.git
index df66266bf80817b2fb6fa8b8165b5587b06fa509..e7c52a91baffe68de229d7b812eed1c5b9391b1e 100644 (file)
@@ -1,9 +1,6 @@
 [submodule "ceph-object-corpus"]
        path = ceph-object-corpus
        url = https://github.com/ceph/ceph-object-corpus.git
-[submodule "src/libs3"]
-       path = src/libs3
-       url = https://github.com/ceph/libs3.git
 [submodule "src/civetweb"]
        path = src/civetweb
        url = https://github.com/ceph/civetweb
index d683fd88700963e9bee8fd171c3bb7663e5bc3eb..2e9f72ba4dec7d01be749aee49feae037d3983c5 100644 (file)
@@ -813,17 +813,6 @@ if test "x$with_jemalloc" = "xyes"; then
        fi
 fi
 
-# use system libs3?
-AC_ARG_WITH([system-libs3],
-       [AS_HELP_STRING([--with-system-libs3], [use system libs3])],
-       ,
-       [with_system_libs3=no])
-AS_IF([test "x$with_system_libs3" = xyes],
-            [AC_CHECK_LIB([s3], [S3_initialize], [true], [AC_MSG_FAILURE([libs3 not found])], [-lpthread])])
-AS_IF([test "x$with_system_libs3" = xcheck],
-            [AC_SEARCH_LIBS([S3_initialize], [s3], [with_system_libs3=yes], [true], [-lpthread])])
-AM_CONDITIONAL(WITH_SYSTEM_LIBS3, [ test "$with_system_libs3" = "yes" ])
-
 # needs libcurl and libxml2
 if test "x$with_rest_bench" = xyes && test "x$with_system_libs3" = xno; then
    AC_CHECK_LIB([curl], [curl_easy_init], [], AC_MSG_ERROR([libcurl not found]))
diff --git a/qa/rgw/s3.sh b/qa/rgw/s3.sh
deleted file mode 100755 (executable)
index 69040b7..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-#!/bin/sh
-
-
-origdir=`pwd`
-# set -x
-
-load_credentials() {
-       if [ -e ~/.s3 ]; then
-               source ~/.s3
-       else
-               echo "ERROR: Credentials not defined!"
-               exit 1
-       fi
-}
-
-if [ "$S3_ACCESS_KEY_ID" == "" ] ||
-   [ "$S3_HOSTNAME" == "" ] ||
-   [ "$S3_SECRET_ACCESS_KEY" == "" ]; then
-        load_credentials
-fi
-
-bindir=${origdir}/libs3/build/bin
-libdir=${origdir}/libs3/build/lib
-log=${origdir}/s3.log
-export LD_LIBRARY_PATH=${libdir}
-s3=${bindir}/s3
-
-tmp_bucket="test-`date +%s`"
-tmpdir="tmp"
-
-cleanup() {
-       rm -fR libs3 tmp
-}
-
-build() {
-       echo "Checking out source"
-       log git clone git://github.com/wido/libs3.git
-       echo "Building"
-       log make -C libs3
-}
-
-init() {
-       cleanup
-       build
-       mkdir -p tmp
-}
-
-log() {
-       "$@" >> $log
-}
-
-check_error() {
-       should_succeed=$1
-       fail=`grep -c ERROR .cmd.log`
-       [ $fail -eq 0 ] && success=1 || success=0
-       if [ $success -ne $should_succeed ]; then
-               [ $should_succeed -ne 0 ] && echo "Command failed:"
-               [ $should_succeed -eq 0 ] && echo "Command succeeded unexpectedly:"
-               echo "$op $params"
-               cat .cmd.log
-               exit 1
-       fi
-}
-
-do_op() {
-       should_succeed=$1
-       shift
-       op=$1
-       shift
-       params="$@"
-       echo "# $op" "$@" | tee -a $log
-       $op "$@" > .cmd.log 2>&1
-       log cat .cmd.log
-       check_error $should_succeed
-}
-
-run_s3() {
-       echo $s3 "$@" >> .cmd.log
-       $s3 "$@"
-}
-
-create_bucket() {
-       bucket_name=$1
-
-       run_s3 create $bucket_name
-}
-
-delete_bucket() {
-       bucket_name=$1
-
-       run_s3 delete $bucket_name
-}
-
-create_file() {
-       filename=$1
-       dd if=/dev/urandom of=$tmpdir/$filename bs=4096 count=2048
-       run_s3 put $tmp_bucket/$filename filename=$tmpdir/$filename
-}
-
-get_file() {
-       filename=$1
-       dest_fname=$2
-       run_s3 get $tmp_bucket/$filename filename=$tmpdir/$dest_fname
-       do_op 1 diff $tmpdir/$filename $tmpdir/$dest_fname
-       rm -f $tmpdir/foo.tmp
-}
-
-get_acl() {
-       filename=$1
-       dest_fname=$2
-       run_s3 getacl $tmp_bucket/$filename filename=$tmpdir/$dest_fname
-}
-
-set_acl() {
-       filename=$1
-       src_fname=$2
-       run_s3 setacl $tmp_bucket/$filename filename=$tmpdir/$src_fname
-}
-
-delete_file() {
-       filename=$1
-       run_s3 delete $tmp_bucket/$filename
-}
-
-get_anon() {
-       should_succeed=$1
-       bucket=$2
-       fname=$3
-       dest=$tmpdir/$4
-
-       echo "# get_anon $@"
-
-       url="http://$bucket.$S3_HOSTNAME/$fname"
-       wget $url -O $dest > .cmd.log 2>&1
-       res=$?
-       log cat .cmd.log
-       if [ $res -ne 0 ]; then
-               echo "ERROR: Could not fetch file anonymously (url=$url)" > .cmd.log
-       fi
-       check_error $should_succeed
-}
-
-add_acl() {
-       filename=$1
-       acl=$2
-       echo $acl >> $tmpdir/$filename
-}
-
-main() {
-       log echo "****************************************************************"
-       log echo "* `date`" >> $log
-       log echo "****************************************************************"
-       init
-       do_op 1 create_bucket $tmp_bucket
-       do_op 0 create_bucket $tmp_bucket
-
-       do_op 1 create_file foo
-       do_op 1 get_file foo foo.tmp
-
-       do_op 1 get_acl foo foo.acl
-       get_anon 0 $tmp_bucket foo foo.anon
-       add_acl foo.acl "Group All Users READ"
-
-       do_op 1 set_acl foo foo.acl
-       get_anon 1 $tmp_bucket foo foo.anon
-
-       do_op 1 delete_file foo
-       do_op 1 delete_bucket $tmp_bucket
-}
-
-
-main "$@"
-
-
index 385879e0dc63f0f0c8d63176024fc7ac0e1abbd5..8d03b898fba83409aca40f2e231913cce058de28 100644 (file)
@@ -1,7 +1,7 @@
 include Makefile-env.am
 
 SUBDIRS += ocf java tracing
-DIST_SUBDIRS += gmock ocf libs3 java tracing
+DIST_SUBDIRS += gmock ocf java tracing
 
 if NO_GIT_VERSION
 export NO_VERSION="yes"
@@ -109,23 +109,6 @@ EXTRA_DIST += \
        yasm-wrapper
 
 EXTRA_DIST += \
-       libs3/COPYING \
-       libs3/ChangeLog \
-       libs3/GNUmakefile \
-       libs3/GNUmakefile.mingw \
-       libs3/GNUmakefile.osx \
-       libs3/INSTALL \
-       libs3/LICENSE \
-       libs3/README \
-       libs3/TODO \
-       libs3/archlinux \
-       libs3/debian \
-       libs3/doxyfile \
-       libs3/inc \
-       libs3/libs3.spec \
-       libs3/mswin \
-       libs3/src \
-       libs3/test \
        unittest_bufferlist.sh
 
 
diff --git a/src/libs3 b/src/libs3
deleted file mode 160000 (submodule)
index dcf98ff..0000000
--- a/src/libs3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dcf98ff04bc5dacd5d45854a32870d86dd7b26c7
index 45ae059813413087067e8ab7469590f903f46885..96b2235c7fab15ef5b93890b91719597e01634a0 100755 (executable)
@@ -111,9 +111,6 @@ do
 done
 
 echo -e "\nSource Code Dependencies:\n"
-echo "src/libs3"
-echo "    Name:    libs3"
-echo "    License: GPLv3"
 echo "src/leveldb"
 echo "    Name:    leveldb"
 echo "    License: Google Public License"