diff --git a/scripts/pkgdep.sh b/scripts/pkgdep.sh index 03e88fa37..5246b54d4 100755 --- a/scripts/pkgdep.sh +++ b/scripts/pkgdep.sh @@ -14,6 +14,7 @@ function usage() { echo " -d --developer-tools Install tools for developers (code styling, code coverage, etc.)" echo " -p --pmem Additional dependencies for reduce, pmdk and pmdkobj" echo " -f --fuse Additional dependencies for FUSE and NVMe-CUSE" + echo " -R --rbd Additional dependencies for RBD" echo " -r --rdma Additional dependencies for RDMA transport in NVMe over Fabrics" echo " -b --docs Additional dependencies for building docs" echo " -u --uring Additional dependencies for io_uring" @@ -26,6 +27,7 @@ function install_all_dependencies() { INSTALL_DEV_TOOLS=true INSTALL_PMEM=true INSTALL_FUSE=true + INSTALL_RBD=true INSTALL_RDMA=true INSTALL_DOCS=true INSTALL_LIBURING=true @@ -36,12 +38,13 @@ INSTALL_CRYPTO=false INSTALL_DEV_TOOLS=false INSTALL_PMEM=false INSTALL_FUSE=false +INSTALL_RBD=false INSTALL_RDMA=false INSTALL_DOCS=false INSTALL_LIBURING=false INSTALL_DAOS=false -while getopts 'abdfhipruD-:' optchar; do +while getopts 'abdfhipruDR-:' optchar; do case "$optchar" in -) case "$OPTARG" in @@ -50,6 +53,7 @@ while getopts 'abdfhipruD-:' optchar; do developer-tools) INSTALL_DEV_TOOLS=true ;; pmem) INSTALL_PMEM=true ;; fuse) INSTALL_FUSE=true ;; + rbd) INSTALL_RBD=true ;; rdma) INSTALL_RDMA=true ;; docs) INSTALL_DOCS=true ;; uring) INSTALL_LIBURING=true ;; @@ -65,6 +69,7 @@ while getopts 'abdfhipruD-:' optchar; do d) INSTALL_DEV_TOOLS=true ;; p) INSTALL_PMEM=true ;; f) INSTALL_FUSE=true ;; + R) INSTALL_RBD=true ;; r) INSTALL_RDMA=true ;; b) INSTALL_DOCS=true ;; u) INSTALL_LIBURING=true ;; diff --git a/scripts/pkgdep/arch.sh b/scripts/pkgdep/arch.sh index 5bee0df3c..6cc404199 100755 --- a/scripts/pkgdep/arch.sh +++ b/scripts/pkgdep/arch.sh @@ -53,6 +53,10 @@ if [[ $INSTALL_FUSE == "true" ]]; then # Additional dependencies for FUSE and NVMe-CUSE pacman -Sy --needed --noconfirm fuse3 fi +if [[ $INSTALL_RBD == "true" ]]; then + echo "Arch Linux does not have librados-devel and librbd-devel in mainline repositories." + echo "You can install them manually" +fi if [[ $INSTALL_RDMA == "true" ]]; then # Additional dependencies for RDMA transport in NVMe over Fabrics if [[ -n "$http_proxy" ]]; then diff --git a/scripts/pkgdep/clear-linux-os.sh b/scripts/pkgdep/clear-linux-os.sh index 90c5c3420..113d02a86 100755 --- a/scripts/pkgdep/clear-linux-os.sh +++ b/scripts/pkgdep/clear-linux-os.sh @@ -23,6 +23,10 @@ if [[ $INSTALL_FUSE == "true" ]]; then # Additional dependencies for FUSE and NVMe-CUSE swupd bundle-add -y devpkg-fuse fi +if [[ $INSTALL_RBD == "true" ]]; then + # Additional dependencies for RBD bdev in NVMe over Fabrics + swupd bundle-add -y librados-devel librbd-devel +fi if [[ $INSTALL_RDMA == "true" ]]; then # Additional dependencies for RDMA transport in NVMe over Fabrics swupd bundle-add -y devpkg-rdma-core network-basic-dev diff --git a/scripts/pkgdep/debian.sh b/scripts/pkgdep/debian.sh index dd2a98fc9..6461b5e4f 100755 --- a/scripts/pkgdep/debian.sh +++ b/scripts/pkgdep/debian.sh @@ -66,6 +66,10 @@ if [[ $INSTALL_FUSE == "true" ]]; then apt-get install -y libfuse3-dev fi fi +if [[ $INSTALL_RBD == "true" ]]; then + # Additional dependencies for RBD bdev in NVMe over Fabrics + apt-get install -y librados-dev librbd-dev +fi if [[ $INSTALL_RDMA == "true" ]]; then # Additional dependencies for RDMA transport in NVMe over Fabrics apt-get install -y libibverbs-dev librdmacm-dev diff --git a/scripts/pkgdep/freebsd.sh b/scripts/pkgdep/freebsd.sh index c039f4acb..23d9fc11c 100755 --- a/scripts/pkgdep/freebsd.sh +++ b/scripts/pkgdep/freebsd.sh @@ -26,3 +26,8 @@ if [[ $INSTALL_LIBURING == "true" ]]; then "$(freebsd-version)" INSTALL_LIBURING=false fi + +if [[ $INSTALL_RBD == "true" ]]; then + # Additional dependencies for RBD bdev in NVMe over Fabrics + pkg install -y ceph +fi diff --git a/scripts/pkgdep/rhel.sh b/scripts/pkgdep/rhel.sh index a8a5ac036..131569603 100755 --- a/scripts/pkgdep/rhel.sh +++ b/scripts/pkgdep/rhel.sh @@ -146,6 +146,10 @@ if [[ $INSTALL_FUSE == "true" ]]; then # Additional dependencies for FUSE and NVMe-CUSE yum install -y fuse3-devel fi +if [[ $INSTALL_RBD == "true" ]]; then + # Additional dependencies for RBD bdev in NVMe over Fabrics + yum install -y librados-devel librbd-devel +fi if [[ $INSTALL_RDMA == "true" ]]; then # Additional dependencies for RDMA transport in NVMe over Fabrics yum install -y libibverbs-devel librdmacm-devel diff --git a/scripts/pkgdep/sles.sh b/scripts/pkgdep/sles.sh index 066ab9cf2..ecf6a081e 100755 --- a/scripts/pkgdep/sles.sh +++ b/scripts/pkgdep/sles.sh @@ -22,6 +22,10 @@ if [[ $INSTALL_FUSE == "true" ]]; then # Additional dependencies for FUSE and NVMe-CUSE zypper install -y fuse3-devel fi +if [[ $INSTALL_RBD == "true" ]]; then + # Additional dependencies for RBD bdev in NVMe over Fabrics + zypper install -y librados-devel librbd-devel +fi if [[ $INSTALL_RDMA == "true" ]]; then # Additional dependencies for RDMA transport in NVMe over Fabrics zypper install -y rdma-core-devel diff --git a/test/common/config/pkgdep/apt-get b/test/common/config/pkgdep/apt-get index 15a4f1e14..d03da6380 100644 --- a/test/common/config/pkgdep/apt-get +++ b/test/common/config/pkgdep/apt-get @@ -44,7 +44,6 @@ packages=( gdb fio libaio-dev - librbd-dev linux-headers-generic libgflags-dev autoconf diff --git a/test/common/config/pkgdep/dnf b/test/common/config/pkgdep/dnf index b2fcf3f46..b3f6e6a5f 100644 --- a/test/common/config/pkgdep/dnf +++ b/test/common/config/pkgdep/dnf @@ -18,7 +18,6 @@ packages=( gdb fio libaio-devel - librbd-devel kernel-devel gflags-devel libasan diff --git a/test/common/config/pkgdep/yum b/test/common/config/pkgdep/yum index 97565fcc7..5080cefe3 100644 --- a/test/common/config/pkgdep/yum +++ b/test/common/config/pkgdep/yum @@ -18,7 +18,6 @@ packages=( gdb fio libaio-devel - librbd-devel kernel-devel gflags-devel libasan