nvme-cli: 2.9.1 -> 2.10

zeppe-lin · Aug 3, 2024 · 29cd3a7 · 29cd3a7
1 parent 2a629f0
commit 29cd3a7
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 3 deletions.
diff --git a/nvme-cli/.footprint b/nvme-cli/.footprint
@@ -104,9 +104,21 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/nvme-nvme-mi-send.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-clear-fw-activate-history.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-clear-pcie-correctable-error-counters.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-device-capability-log.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-eol-plp-failure-mode.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-error-recovery-log.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-get-dssd-async-event-config.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-get-dssd-power-state-feature.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-get-plp-health-check-interval.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-internal-log.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-latency-monitor-log.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-set-dssd-async-event-config.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-set-dssd-power-state-feature.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-set-plp-health-check-interval.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-set-telemetry-profile.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-smart-add-log.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-telemetry-string-log-page.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-ocp-unsupported-reqs-log.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-persistent-event-log.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-pred-lat-event-agg-log.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-predictable-lat-log.1.gz
@@ -147,6 +159,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/nvme-subsystem-reset.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-supported-log-pages.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-telemetry-log.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nvme-tls-key.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-toshiba-clear-pcie-correctable-errors.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-toshiba-vs-internal-log.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvme-toshiba-vs-smart-add-log.1.gz

diff --git a/nvme-cli/.md5sum b/nvme-cli/.md5sum
@@ -1 +1,2 @@
-11cc5def13610e7250ecb1148be26152  nvme-cli-2.9.1.tar.gz
+83134a8586bc221d44fe067b86de4d93  4c1e89f14474efc01e41e9c45d2bfa8467b9c1e5.patch
+50aca763b0c931dfb2af79c6762958e5  nvme-cli-2.10.tar.gz
diff --git a/nvme-cli/4c1e89f14474efc01e41e9c45d2bfa8467b9c1e5.patch b/nvme-cli/4c1e89f14474efc01e41e9c45d2bfa8467b9c1e5.patch
@@ -0,0 +1,31 @@
+From 4c1e89f14474efc01e41e9c45d2bfa8467b9c1e5 Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <dwagner@suse.de>
+Date: Fri, 2 Aug 2024 11:46:49 +0200
+Subject: [PATCH] docs: rename ocp-unsupported-req-log file
+
+The filename has to match the command name, thus rename the filename.
+
+Signed-off-by: Daniel Wagner <dwagner@suse.de>
+---
+ Documentation/meson.build                                       | 2 +-
+ ...ted-reqs-log-pages.txt => nvme-ocp-unsupported-reqs-log.txt} | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename Documentation/{nvme-ocp-unsupported-reqs-log-pages.txt => nvme-ocp-unsupported-reqs-log.txt} (100%)
+
+diff --git a/Documentation/meson.build b/Documentation/meson.build
+index 30c0efc418..1478134175 100644
+--- a/Documentation/meson.build
++++ b/Documentation/meson.build
+@@ -103,7 +103,7 @@ adoc_sources = [
+   'nvme-ocp-set-telemetry-profile',
+   'nvme-ocp-smart-add-log',
+   'nvme-ocp-telemetry-string-log-page',
+-  'nvme-ocp-unsupported-reqs-log-pages',
++  'nvme-ocp-unsupported-reqs-log',
+   'nvme-ocp-internal-log',
+   'nvme-persistent-event-log',
+   'nvme-pred-lat-event-agg-log',
+diff --git a/Documentation/nvme-ocp-unsupported-reqs-log-pages.txt b/Documentation/nvme-ocp-unsupported-reqs-log.txt
+similarity index 100%
+rename from Documentation/nvme-ocp-unsupported-reqs-log-pages.txt
+rename to Documentation/nvme-ocp-unsupported-reqs-log.txt
diff --git a/nvme-cli/Pkgfile b/nvme-cli/Pkgfile
@@ -3,11 +3,14 @@
 # Depends on:  libnvme
 
 name=nvme-cli
-version=2.9.1
+version=2.10
 release=1
-source=https://github.com/linux-nvme/$name/archive/v$version/$name-$version.tar.gz
+source="https://github.com/linux-nvme/$name/archive/v$version/$name-$version.tar.gz
+	4c1e89f14474efc01e41e9c45d2bfa8467b9c1e5.patch"
 
 build() {
+	patch -d $name-$version -p1 -i $SRC/4c1e89f14474efc01e41e9c45d2bfa8467b9c1e5.patch
+
 	meson setup build $name-$version           \
 		--prefix=/usr                      \
 		--libexecdir=lib                   \