import nvme-cli-2.2.1-2.el9

.gitignore

@@ -1 +1 @@
-SOURCES/nvme-cli-2.0.tar.gz
+SOURCES/nvme-cli-2.2.1.tar.gz

.nvme-cli.metadata

@@ -1 +1 @@
-ba824c8c79b2f5bbe77f3940481981ef02fa9787 SOURCES/nvme-cli-2.0.tar.gz
+1b66c5cb0d83948557c431157130565f1710b665 SOURCES/nvme-cli-2.2.1.tar.gz

SOURCES/0001-nvme-Return-status-error-code-for-effects-log-comman.patch

@@ -1,102 +0,0 @@
-From 43c1ac652b74182e483f2e8033a5f5fe417fb429 Mon Sep 17 00:00:00 2001
-From: Daniel Wagner <dwagner@suse.de>
-Date: Mon, 11 Jul 2022 13:39:39 +0200
-Subject: [PATCH] nvme: Return status/error code for effects-log command
-
-collect_effects_log eats up the return code from
-nvme_get_log_cmd_effects. Forward it to the shell..
-
-Fixes: 155fbebfe7b7 ("Update effects-log to handle multiple command sets")
-
-Signed-off-by: Daniel Wagner <dwagner@suse.de>
----
- nvme.c | 44 ++++++++++++++++++++++++--------------------
- 1 file changed, 24 insertions(+), 20 deletions(-)
-
-diff --git a/nvme.c b/nvme.c
-index a2a9996a..6df08d7e 100644
---- a/nvme.c
-+++ b/nvme.c
-@@ -587,18 +587,22 @@ ret:
- 	return err;
- }
- 
--void collect_effects_log(int fd, enum nvme_csi csi, struct list_head *list, int flags)
-+static int collect_effects_log(int fd, enum nvme_csi csi,
-+			       struct list_head *list, int flags)
- {
-+	nvme_effects_log_node_t *node;
- 	int err;
--	nvme_effects_log_node_t *node = malloc(sizeof(nvme_effects_log_node_t));
-+
-+	node = malloc(sizeof(nvme_effects_log_node_t));
- 	if (!node)
--		return;
-+		return -ENOMEM;
-+
- 	node->csi = csi;
- 
- 	err = nvme_get_log_cmd_effects(fd, csi, &node->effects);
- 	if (!err) {
- 		list_add(list, &node->node);
--		return;
-+		return err;
- 	}
- 	else if (err > 0)
- 		nvme_show_status(err);
-@@ -606,6 +610,7 @@ void collect_effects_log(int fd, enum nvme_csi csi, struct list_head *list, int
- 		fprintf(stderr, "effects log page: %s\n", nvme_strerror(errno));
- 
- 	free(node);
-+	return err;
- }
- 
- static int get_effects_log(int argc, char **argv, struct command *cmd, struct plugin *plugin)
-@@ -676,29 +681,28 @@ static int get_effects_log(int argc, char **argv, struct command *cmd, struct pl
- 		nvme_command_set_supported = NVME_CAP_CSS(cap) & NVME_CAP_CSS_NVM;
- 		other_command_sets_supported = NVME_CAP_CSS(cap) & NVME_CAP_CSS_CSI;
- 
-+		if (nvme_command_set_supported)
-+			err = collect_effects_log(fd, NVME_CSI_NVM,
-+						  &log_pages, flags);
- 
--		if (nvme_command_set_supported) {
--			collect_effects_log(fd, NVME_CSI_NVM, &log_pages, flags);
--		}
--
--		if (other_command_sets_supported) {
--			collect_effects_log(fd, NVME_CSI_ZNS, &log_pages, flags);
--		}
--
--		nvme_print_effects_log_pages(&log_pages, flags);
-+		if (!err && other_command_sets_supported)
-+			err = collect_effects_log(fd, NVME_CSI_ZNS,
-+						  &log_pages, flags);
- 
--	}
--	else {
--		collect_effects_log(fd, cfg.csi, &log_pages, flags);
--		nvme_print_effects_log_pages(&log_pages, flags);
-+	} else {
-+		err = collect_effects_log(fd, cfg.csi, &log_pages, flags);
- 	}
- 
-+	if (!err)
-+		nvme_print_effects_log_pages(&log_pages, flags);
-+	else if (err > 0)
-+		nvme_show_status(err);
-+	else
-+		perror("effects log page");
- 
- close_fd:
--	while ((node = list_pop(&log_pages, nvme_effects_log_node_t, node))) {
-+	while ((node = list_pop(&log_pages, nvme_effects_log_node_t, node)))
- 		free(node);
--	}
--
- 	close(fd);
- ret:
- 	return err;
--- 
-2.31.1
-

SPECS/nvme-cli.spec

@@ -2,23 +2,21 @@
 #%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
 Name:           nvme-cli
-Version:        2.0
-Release:        3%{?dist}
+Version:        2.2.1
+Release:        2%{?dist}
 Summary:        NVMe management command line interface
 
 License:        GPLv2+
 URL:            https://github.com/linux-nvme/nvme-cli
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
-#Patch0:         nvme-cli-makefile-dont-install-host-params-patch
-Patch0:         0001-nvme-Return-status-error-code-for-effects-log-comman.patch
-
-BuildRequires:  meson >= 0.47.0
+BuildRequires:  meson >= 0.48.0
 BuildRequires:  gcc gcc-c++
 BuildRequires:  libuuid-devel
 BuildRequires:  systemd-devel
+BuildRequires:  systemd-rpm-macros
 BuildRequires:  zlib-devel
-BuildRequires:  libnvme-devel >= 1.0
+BuildRequires:  libnvme-devel >= 1.2
 BuildRequires:  json-c-devel >= 0.14
 BuildRequires:  asciidoc
 BuildRequires:  xmlto
@@ -32,9 +30,6 @@ nvme-cli provides NVM-Express user space tooling for Linux.
 #%%setup -qn %%{name}-%%{commit0}
 %setup -q
 
-%patch0 -p1
-
-
 %build
 %meson -Dudevrulesdir=%{_udevrulesdir} -Dsystemddir=%{_unitdir} -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir}
 %meson_build
@@ -83,13 +78,24 @@ if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then
         fi
 
 	# apply udev and systemd changes that we did
-	systemctl enable nvmefc-boot-connections
+	if [ $1 -eq 1 ]; then
+		systemctl enable nvmefc-boot-connections
+	fi
 	systemctl daemon-reload
 	udevadm control --reload-rules && udevadm trigger
 	exit 0
 fi
 
 %changelog
+* Thu Nov 10 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.2-2
+- Do not re-enable nvmefc-boot-connections when the package gets updated
+
+* Mon Sep 26 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.2-1
+- Update to version v2.1.2
+
+* Fri Aug 29 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.0-4
+- Fix BZ2104945
+
 * Fri Jul 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.0-3
 - Fix BZ2105742