From 1b2eb024105423826d1df2319991e83393939e9d Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Wed, 20 Jan 2021 19:06:35 +0100 Subject: [PATCH] test/vm_setup.sh : install igb_uio igb_uio was removed from dpdk 20.11 and moved to a separate repository: http://doc.dpdk.org/guides/rel_notes/release_20_11.html Because of that igb_uio module does not build as part of dpdk meson build, and we have to build and install it ourselves as part of test dependencies. Change-Id: I4081bc3b0233ebaf5dbf926665edf28fa3463fbe Signed-off-by: Karol Latecki Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6006 Reviewed-by: Tomasz Zawadzki Reviewed-by: Michal Berger Reviewed-by: Changpeng Liu Tested-by: SPDK CI Jenkins --- test/common/config/pkgdep/git | 11 +++++++++++ test/common/config/vm_setup.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index cd37d9dfa..90778904d 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -382,6 +382,14 @@ function install_vagrant() { done } +function install_igb_uio() { + git clone "${GIT_REPO_DPDK_KMODS}" "$GIT_REPOS/dpdk-kmods" + (cd "$GIT_REPOS/dpdk-kmods/linux/igb_uio" && make -j ${jobs}) + sudo mkdir -p "/lib/modules/$(uname -r)/extra/dpdk" + sudo cp "$GIT_REPOS/dpdk-kmods/linux/igb_uio/igb_uio.ko" "/lib/modules/$(uname -r)/extra/dpdk" + sudo depmod +} + GIT_VERSION=2.25.1 : ${GIT_REPO_SPDK=https://github.com/spdk/spdk.git} export GIT_REPO_SPDK @@ -403,6 +411,8 @@ export GIT_REPO_INTEL_IPSEC_MB export DRIVER_LOCATION_QAT : ${GIT_REPO_GIT=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz} export GIT_REPO_GIT +: ${GIT_REPO_DPDK_KMODS=http://dpdk.org/git/dpdk-kmods} +export GIT_REPO_DPDK_KMODS GIT_REPOS=${GIT_REPOS:-$HOME} gcc_version=$(gcc -dumpversion) gcc_version=${gcc_version%%.*} @@ -427,6 +437,7 @@ else install_rocksdb install_flamegraph install_qemu + install_igb_uio ) install_extra_pkgs fi diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 5a25103c8..2da3675f7 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -29,7 +29,7 @@ VM_SETUP_PATH=$(readlink -f ${BASH_SOURCE%/*}) UPGRADE=false INSTALL=false -CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk,vagrant" +CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk,vagrant,igb_uio" package_manager= function pre_install() { :; }