From 6434aaa274e37f271b25d0e937da08c994ab98f2 Mon Sep 17 00:00:00 2001 From: Ziye Yang Date: Tue, 3 Aug 2021 23:47:36 +0800 Subject: [PATCH] scripts/pkgdep: Add the libpmem object library dependency. Since we will create new bdev relied on libpmem object library, so need add it. Change-Id: I7ddcc694fd2ec5a0536abc9813b13fa429fcf068 Signed-off-by: Ziye Yang Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9049 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Reviewed-by: Tomasz Zawadzki Reviewed-by: Paul Luse Reviewed-by: Monica Kenguva Reviewed-by: Changpeng Liu Reviewed-by: Reviewed-by: Aleksey Marchuk Tested-by: SPDK CI Jenkins --- scripts/pkgdep.sh | 2 +- scripts/pkgdep/debian.sh | 1 + scripts/pkgdep/rhel.sh | 1 + scripts/pkgdep/sles.sh | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/pkgdep.sh b/scripts/pkgdep.sh index 3045b6a24..459cd7985 100755 --- a/scripts/pkgdep.sh +++ b/scripts/pkgdep.sh @@ -12,7 +12,7 @@ function usage() { echo " -h --help" echo " -a --all" echo " -d --developer-tools Install tools for developers (code styling, code coverage, etc.)" - echo " -p --pmem Additional dependencies for reduce and pmdk" + echo " -p --pmem Additional dependencies for reduce, pmdk and pmdkobj" echo " -f --fuse Additional dependencies for FUSE and NVMe-CUSE" echo " -r --rdma Additional dependencies for RDMA transport in NVMe over Fabrics" echo " -b --docs Additional dependencies for building docs" diff --git a/scripts/pkgdep/debian.sh b/scripts/pkgdep/debian.sh index 9c07ca688..9110a846e 100755 --- a/scripts/pkgdep/debian.sh +++ b/scripts/pkgdep/debian.sh @@ -43,6 +43,7 @@ if [[ $INSTALL_PMEM == "true" ]]; then if [[ $NAME == "Ubuntu" ]] && [[ $VERSION_ID_NUM -gt 1800 ]]; then apt-get install -y libpmem-dev apt-get install -y libpmemblk-dev + apt-get install -y libpmemobj-dev fi fi if [[ $INSTALL_FUSE == "true" ]]; then diff --git a/scripts/pkgdep/rhel.sh b/scripts/pkgdep/rhel.sh index 19abdf03f..4024873c1 100755 --- a/scripts/pkgdep/rhel.sh +++ b/scripts/pkgdep/rhel.sh @@ -120,6 +120,7 @@ fi if [[ $INSTALL_PMEM == "true" ]]; then # Additional dependencies for building pmem based backends yum install -y libpmemblk-devel || true + yum install -y libpmemobj-devel || true fi if [[ $INSTALL_FUSE == "true" ]]; then # Additional dependencies for FUSE and NVMe-CUSE diff --git a/scripts/pkgdep/sles.sh b/scripts/pkgdep/sles.sh index f554c5902..1e722a08d 100755 --- a/scripts/pkgdep/sles.sh +++ b/scripts/pkgdep/sles.sh @@ -16,6 +16,7 @@ fi if [[ $INSTALL_PMEM == "true" ]]; then # Additional dependencies for building pmem based backends zypper install -y libpmemblk-devel + zypper install -y libpmemobj-devel fi if [[ $INSTALL_FUSE == "true" ]]; then # Additional dependencies for FUSE and NVMe-CUSE