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

pkgdep/git: Bump nvme-cli to latest release, 2.5 



Versions prior 2.3 have a broken json output under the "list" command,
hence pulling the latest changes to mitigate that.

Also, since 2.5 by default tries to use system's libnvme at a version
(1.5), which may not be available under some distros (e.g. fedora37
still ships with 1.2.1), use meson directly to force the build against
the nvme-cli's libnvme subproject.

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


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

test/common/config/pkgdep/git

+5 −3
Original line number Diff line number Diff line
@@ -165,11 +165,13 @@ function install_nvmecli() { 
	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 v2.0

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



	cflags=("-Wno-error")

	meson setup --force-fallback-for=libnvme \

		"$GIT_REPOS/nvme-cli-cuse/.build" \

		"$GIT_REPOS/nvme-cli-cuse"

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



	make -C "$GIT_REPOS/nvme-cli-cuse" CFLAGS="${cflags[*]}"

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

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

	fi