From 261384fe46ecf00542e52a693568377bce8c3969 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Mon, 25 Jul 2022 15:22:46 +0200 Subject: [PATCH] pkgdep/git: Bump nvme-cli to v2.0 release Older compilers (e.g. 7.5 on ubuntu1804) are having issues under v1.16 due to: plugins/intel/intel-nvme.c:666:47: error: initializer element is not constant static const int LATENCY_STATS_V4_BASE_VAL = ( Makefile:108: recipe for target 'plugins/intel/intel-nvme.o' failed This was fixed by the following commit which is present in the v2.0 release: https://github.com/linux-nvme/nvme-cli/commit/e7309044f3ed48b0b6138dfc22a72d8fc1108580 Signed-off-by: Michal Berger Change-Id: I7ebcf1b1fdb44500a21bcf3feceb07a722e8fc30 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13775 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Dong Yi Reviewed-by: Tomasz Zawadzki --- test/common/config/pkgdep/git | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index cadc1cc71..fc8b1a2c6 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -317,7 +317,7 @@ 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 v1.16 + git -C "$GIT_REPOS/nvme-cli-cuse" checkout v2.0 cflags=("-Wno-error") @@ -326,6 +326,10 @@ function install_nvmecli() { sudo rm -rf /usr/local/src/nvme-cli fi sudo 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/ + fi } function install_libiscsi() {