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

pkgdep/git: Add optional prefix to qemu dirs

Browse Source 
This is done in order to distinguish between different flavors more
easily.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: I9740677c878a8e6ad5abb3e2b5c22b9d41d59fc6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7117
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
This commit is contained in:
Michal Berger 2021-03-29 11:41:07 +02:00 committed by Jim Harris
parent 18ee5d7bff
commit 3124e71569
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/common/config/pkgdep/git
View File

@ -258,15 +258,22 @@ function install_flamegraph() {
function _install_qemu() { function _install_qemu() {
local repo=$1 local repo=$1
local branch=$2 local branch=$2
local prefix=${3:-}
mkdir -p "$GIT_REPOS/qemu" mkdir -p "$GIT_REPOS/qemu"
if [[ ! -d $GIT_REPOS/qemu/$branch ]]; then
git clone "$repo" -b "$branch" "$GIT_REPOS/qemu/$branch" local repo_dir=$GIT_REPOS/qemu/$branch
if [[ -n $prefix ]]; then
repo_dir=$GIT_REPOS/qemu/$prefix-$branch
fi
if [[ ! -d $repo_dir ]]; then
git clone "$repo" -b "$branch" "$repo_dir"
else else
echo "qemu already checked out. Skipping" echo "qemu already checked out. Skipping"
fi fi
declare -a opt_params=("--prefix=/usr/local/qemu/$branch") declare -a opt_params=("--prefix=/usr/local/qemu/${repo_dir##*/}")
declare -a extra_cflags=() declare -a extra_cflags=()
opt_params+=("--disable-docs") opt_params+=("--disable-docs")
@ -288,10 +295,10 @@ function _install_qemu() {
opt_params+=("--extra-cflags=${extra_cflags[*]}") opt_params+=("--extra-cflags=${extra_cflags[*]}")
# The qemu configure script places several output files in the CWD. # The qemu configure script places several output files in the CWD.
(cd "$GIT_REPOS/qemu/$branch" && ./configure "${opt_params[@]}" --target-list="x86_64-softmmu" --enable-kvm --enable-linux-aio --enable-numa) (cd "$repo_dir" && ./configure "${opt_params[@]}" --target-list="x86_64-softmmu" --enable-kvm --enable-linux-aio --enable-numa)
make -C "$GIT_REPOS/qemu/$branch" -j${jobs} make -C "$repo_dir" -j${jobs}
sudo make -C "$GIT_REPOS/qemu/$branch" install sudo make -C "$repo_dir" install
} }
function install_qemu() { function install_qemu() {
@ -309,9 +316,10 @@ function install_qemu() {
SPDK_QEMU_BRANCH=spdk-5.0.0 SPDK_QEMU_BRANCH=spdk-5.0.0
VFIO_QEMU_BRANCH=vfio-user-v0.6 VFIO_QEMU_BRANCH=vfio-user-v0.6
VANILLA_QEMU_BRANCH=v5.1.0 VANILLA_QEMU_BRANCH=v5.1.0
_install_qemu $GIT_REPO_QEMU_SPDK $SPDK_QEMU_BRANCH _install_qemu $GIT_REPO_QEMU_SPDK $SPDK_QEMU_BRANCH
_install_qemu $GIT_REPO_QEMU_VFIO $VFIO_QEMU_BRANCH _install_qemu $GIT_REPO_QEMU_VFIO $VFIO_QEMU_BRANCH
_install_qemu "$GIT_REPO_QEMU" "$VANILLA_QEMU_BRANCH" _install_qemu "$GIT_REPO_QEMU" "$VANILLA_QEMU_BRANCH" vanilla
} }
function install_nvmecli() { function install_nvmecli() {