From f50ea1440321ee2f500effedeaf5a48e8fb50b4b Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 28 Apr 2017 14:40:52 -0700 Subject: [PATCH] rocksdb: stop passing $DPDK_DIR to db_bench build The RocksDB SPDK environment no longer depends directly on DPDK. Change-Id: Ifcabcd137292f86724a1e3fed93abb94fa5a2344 Signed-off-by: Daniel Verkamp --- doc/blobfs.md | 2 +- test/blobfs/rocksdb/rocksdb.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/blobfs.md b/doc/blobfs.md index 8f226bed4..b95832eea 100644 --- a/doc/blobfs.md +++ b/doc/blobfs.md @@ -13,7 +13,7 @@ 3. Build RocksDB. Note that currently only the db_bench benchmarking tool is integrated with BlobFS. (Note: add "DEBUG_LEVEL=0" for a release build.) - make db_bench DPDK_DIR=path/to/dpdk/x86_64-native-linuxapp-gcc SPDK_DIR=path/to/spdk + make db_bench SPDK_DIR=path/to/spdk 4. Copy etc/spdk/rocksdb.conf.in to /usr/local/etc/spdk/rocksdb.conf. diff --git a/test/blobfs/rocksdb/rocksdb.sh b/test/blobfs/rocksdb/rocksdb.sh index 3878d5e7c..05acba83f 100755 --- a/test/blobfs/rocksdb/rocksdb.sh +++ b/test/blobfs/rocksdb/rocksdb.sh @@ -20,7 +20,7 @@ timing_enter rocksdb timing_enter db_bench_build pushd $DB_BENCH_DIR -$MAKE db_bench $MAKEFLAGS $MAKECONFIG DEBUG_LEVEL=0 SPDK_DIR=$rootdir DPDK_DIR=$DPDK_DIR +$MAKE db_bench $MAKEFLAGS $MAKECONFIG DEBUG_LEVEL=0 SPDK_DIR=$rootdir popd timing_exit db_bench_build