Commit ba7fd26c authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

pkgdep/git: don't skip nvme-cli installation 



Don't skip nvme-cli installation in case previous
installation is detected. This avoids the need to
manually remove previous version installation and
makes it less likely to overlook that nvme-cli was
not upgraded.

Also updating an out-of-date comment in this
function.

Change-Id: I8c6a457ea5ab2eb2f7d48de4721af82d8de7733e
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11480


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
parent 945a2e7b

test/common/config/pkgdep/git

+9 −10
Original line number Diff line number Diff line
@@ -302,17 +302,16 @@ function install_qemu() { 
}



function install_nvmecli() {

	if [ ! -d "/usr/local/src/nvme-cli" ]; then

		# Changes required for SPDK are already merged on top of

		# nvme-cli, however not released yet.

		# Support for SPDK should be released in nvme-cli >1.11.1

	# nvme-cli >1.11.1 should be used.

	if [[ ! -d $GIT_REPOS/nvme-cli-cuse ]]; then

		git clone "https://github.com/linux-nvme/nvme-cli.git" "$GIT_REPOS/nvme-cli-cuse"

	fi

	git -C "$GIT_REPOS/nvme-cli-cuse" checkout v1.16

	make -C "$GIT_REPOS/nvme-cli-cuse" CPPFLAGS="-Wno-error=maybe-uninitialized"

		sudo mv "$GIT_REPOS/nvme-cli-cuse" /usr/local/src/nvme-cli

	if [ -d "/usr/local/src/nvme-cli" ]; then

		sudo rm -rf /usr/local/src/nvme-cli

	fi

	sudo mv "$GIT_REPOS/nvme-cli-cuse" /usr/local/src/nvme-cli

}



function install_libiscsi() {