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

pkgdep/git: Make qemu's BRANCH vars global



This would make easier for the 3rd party tooling to adjust env for
the install_* routines.

Signed-off-by: default avatarMichal Berger <michalx.berger@intel.com>
Change-Id: Ib5ea447bc67080f106cc43e005143bd52e91c768
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8122


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 815ce363
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -286,11 +286,6 @@ function install_qemu() {
	#  - vfio-user QEMU: A special fork to test libvfio-user components.
	#  - Vanilla QEMU: Used for the upstream PMR support.

	# Forked QEMUs
	SPDK_QEMU_BRANCH=spdk-5.0.0
	VFIO_QEMU_BRANCH=vfio-user-master
	VANILLA_QEMU_BRANCH=v6.0.0

	_install_qemu $GIT_REPO_QEMU_SPDK $SPDK_QEMU_BRANCH
	_install_qemu $GIT_REPO_QEMU_VFIO $VFIO_QEMU_BRANCH
	_install_qemu "$GIT_REPO_QEMU" "$VANILLA_QEMU_BRANCH" vanilla
@@ -534,6 +529,10 @@ function install_sources() {
GIT_VERSION=2.25.1
IRDMA_VERSION=1.5.2
ICE_VERSION=1.4.11
SPDK_QEMU_BRANCH=${SPDK_QEMU_BRANCH:-spdk-5.0.0}
VFIO_QEMU_BRANCH=${VFIO_QEMU_BRANCH:-vfio-user-master}
VANILLA_QEMU_BRANCH=${VANILLA_QEMU_BRANCH:-v6.0.0}

: ${GIT_REPO_SPDK=https://github.com/spdk/spdk.git}
export GIT_REPO_SPDK
: ${GIT_REPO_DPDK=https://github.com/spdk/dpdk.git}