Commit db31afaa authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

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



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: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4190


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent b85b7e2b

test/common/config/pkgdep/git

+7 −9
Original line number Diff line number Diff line
@@ -336,7 +336,6 @@ IFS="," read -ra conf_env <<< "$CONF" 
for conf in "${conf_env[@]}"; do

	export "INSTALL_${conf^^}=true"

done

sources=(install_refspdk)



if [[ $OSID == freebsd ]]; then

	jobs=$(($(sysctl -n hw.ncpu) * 2))
@@ -354,18 +353,11 @@ else 
fi

sources+=(install_fio)

sources+=(install_vagrant)

sources+=(install_spdk)



sudo mkdir -p /usr/{,local}/src

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

	source_conf=${source^^}

	if [[ ${!source_conf} == true ]]; then
@@ -373,3 +365,9 @@ for source in "${sources[@]}"; do 
	fi

done

wait



if [[ $INSTALL_REFSPDK == true ]]; then

	# Serialize builds as refspdk depends on spdk

	[[ $INSTALL_SPDK != true ]] && install_spdk

	install_refspdk

fi