ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vm_setup:install right packages on ubuntu for SoftRoCE

Browse Source 
Ubuntu18 integrates librxe to rdma-core, libibverbs-dev no longer ships infiniband/driver.h.
Don't compile librxe on ubuntu18, install package rdma-core instead. ubuntu16 keeps the old
method. Otherwise, there's no NIC can be found for SoftRoCE failed.

Change-Id: Ib639b96a4229c79f2b27fda7b981d7a805f808cb
Signed-off-by: yidong0635 <dongx.yi@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455336
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
yidong0635 2019-05-22 07:27:53 -04:00 committed by Jim Harris
parent fd50b50738
commit 0a48fd0601
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/common/config/vm_setup.sh
View File

@ -25,6 +25,7 @@ VM_SETUP_PATH=$(readlink -f ${BASH_SOURCE%/*})
UPGRADE=false UPGRADE=false
INSTALL=false INSTALL=false
CONF="librxe,iscsi,rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli,qat,ocf" CONF="librxe,iscsi,rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli,qat,ocf"
LIBRXE_INSTALL=true
OSID=$(source /etc/os-release && echo $ID) OSID=$(source /etc/os-release && echo $ID)
PACKAGEMNG='undefined' PACKAGEMNG='undefined'
@ -481,7 +482,13 @@ if $INSTALL; then
sudo apt-get install -y libasan2 sudo apt-get install -y libasan2
sudo apt-get install -y libubsan0 sudo apt-get install -y libubsan0
fi fi
if ! sudo apt-get install -y rdma-core; then
echo "Package rdma-core is avaliable at Ubuntu 18 [universe] repositorium" >&2
sudo apt-get install -y rdmacm-utils
sudo apt-get install -y ibverbs-utils
else
LIBRXE_INSTALL=false
fi
if ! sudo apt-get install -y libpmempool1; then if ! sudo apt-get install -y libpmempool1; then
echo "Package libpmempool1 is available at Ubuntu 18 [universe] repositorium" >&2 echo "Package libpmempool1 is available at Ubuntu 18 [universe] repositorium" >&2
fi fi
@ -517,8 +524,6 @@ if $INSTALL; then
flex \ flex \
bison \ bison \
libswitch-perl \ libswitch-perl \
rdmacm-utils \
ibverbs-utils \
gdisk \ gdisk \
socat \ socat \
sshfs \ sshfs \
@ -537,7 +542,11 @@ fi
sudo mkdir -p /usr/src sudo mkdir -p /usr/src
if [ $LIBRXE_INSTALL = true ]; then
#Ubuntu18 integrates librxe to rdma-core, libibverbs-dev no longer ships infiniband/driver.h.
#Don't compile librxe on ubuntu18 or later version, install package rdma-core instead.
install_rxe_cfg& install_rxe_cfg&
fi
install_iscsi_adm& install_iscsi_adm&
install_rocksdb& install_rocksdb&
install_fio& install_fio&