From: Kefu Chai Date: Thu, 15 Nov 2018 05:02:59 +0000 (+0800) Subject: qa: patch rocksdb the right way X-Git-Tag: v14.1.0~924^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F25106%2Fhead;p=ceph.git qa: patch rocksdb the right way quote from patch(1) > but usually just > > patch -pnum --- diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh index 1ea2c26b5277..cd8cfbb8b93e 100755 --- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh +++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh @@ -73,7 +73,7 @@ git clone https://github.com/facebook/rocksdb.git --depth 1 # compile code cd rocksdb -patch -p1 $(dirname $0)/0001-cmake-add-Findrados.cmake-and-use-it.patch +patch -p1 <$(dirname $0)/0001-cmake-add-Findrados.cmake-and-use-it.patch mkdir build && cd build && cmake -DWITH_LIBRADOS=ON -DWITH_SNAPPY=ON -DWITH_GFLAGS=OFF -DFAIL_ON_WARNINGS=OFF .. make rocksdb_env_librados_test -j8