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

pkgdep/git: Simplify nvme-cli build 



We shouldn't care about existing copies, simply nuke them. Drop
(entire pkgdep infra should be run as root from the very get-go).

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


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent d6b4caf5

test/common/config/pkgdep/git

+5 −7
Original line number Diff line number Diff line
@@ -162,9 +162,8 @@ function install_qemu() { 


function install_nvmecli() {

	# nvme-cli >1.11.1 should be used.

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

	rm -rf "$GIT_REPOS/nvme-cli-cuse"

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

	fi

	git -C "$GIT_REPOS/nvme-cli-cuse" checkout v2.5



	meson setup --force-fallback-for=libnvme \
@@ -172,10 +171,9 @@ function install_nvmecli() { 
		"$GIT_REPOS/nvme-cli-cuse"

	meson compile -C "$GIT_REPOS/nvme-cli-cuse/.build"



	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

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

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



	# Make sure binary is available for the cuse tests

	if [[ -e /usr/local/src/nvme-cli/.build/nvme ]]; then

		sudo ln -s .build/nvme /usr/local/src/nvme-cli/