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

pkgdep/git: Rearrange order in which install_refspdk() is called

Browse Source 
Since refspdk has its source built, we should give it a chance to
avoid any potential issues with missing dependencies. To do that,
let's run it at the very end after all other sources were already
put in place (this is mainly relevant to FreeBSD where cmdline
for ./configure is hardcoded).

Change-Id: Ic07129c7b879eff7fddd734c9c4a6787df3da7ec
Signed-off-by: Michal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4190
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger 2020-09-11 22:02:13 +02:00 committed by Tomasz Zawadzki
parent b85b7e2b93
commit db31afaaef
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,7 +336,6 @@ IFS="," read -ra conf_env <<< "$CONF"
for conf in "${conf_env[@]}"; do for conf in "${conf_env[@]}"; do
export "INSTALL_${conf^^}=true" export "INSTALL_${conf^^}=true"
done done
sources=(install_refspdk)
if [[ $OSID == freebsd ]]; then if [[ $OSID == freebsd ]]; then
jobs=$(($(sysctl -n hw.ncpu) * 2)) jobs=$(($(sysctl -n hw.ncpu) * 2))
@ -354,18 +353,11 @@ else
fi fi
sources+=(install_fio) sources+=(install_fio)
sources+=(install_vagrant) sources+=(install_vagrant)
sources+=(install_spdk)
sudo mkdir -p /usr/{,local}/src sudo mkdir -p /usr/{,local}/src
sudo mkdir -p "$GIT_REPOS" sudo mkdir -p "$GIT_REPOS"
if [[ $INSTALL_REFSPDK == true ]]; then
# Serialize builds as refspdk depends on spdk
install_spdk
install_refspdk
else
sources+=(install_spdk)
fi
for source in "${sources[@]}"; do for source in "${sources[@]}"; do
source_conf=${source^^} source_conf=${source^^}
if [[ ${!source_conf} == true ]]; then if [[ ${!source_conf} == true ]]; then
@ -373,3 +365,9 @@ for source in "${sources[@]}"; do
fi fi
done done
wait wait
if [[ $INSTALL_REFSPDK == true ]]; then
# Serialize builds as refspdk depends on spdk
[[ $INSTALL_SPDK != true ]] && install_spdk
install_refspdk
fi