Accepting request 1191151 from home:wagi:branches:Base:System

- Update to version 2.10: * sed: Fix parsing of Discovery0 features * fabrics: avoid potential segfault in nvmf_dim() * nvme: avoid segfault in show-topology (bsc#1226197) * fabrics: do not leak nvme_ctrl_t object on connect * nvme: extend help message when mmap regs fails * nvme: return -ENXIO value to open device if errno not set * wdc: OCP 2.5 Log Page Updates * fabrics: drop --quiet alias -S * fabrics: drop --disable-sqflow alias -d * fabrics: check if json config is existing * plugins/ocp: fix UAF when printing telemetry log * nvme-print-stdout: fix persistent-event-log set feature event output * fabrics: do not report error when no modules are loaded when disconnecting * fabrics: use cleanup helper where possible * fabrics: print an error for ENOENT too * plugins/virtium: use time_t for time_stamp values * completions: add ocp set-error-injection command * doc: add ocp set-error-injection command * ocp: add set-error-injection command * nvme: use argconfig_parse_seen to check conditions * nvme: use proper mask to get correct lbafu value * utils: fix print formatting option * utils: cleanup includes in utils.h * utils: add missing header * nvme-print: Added print for two new fields for HMB feature * plugins/micron: Move OCP internal log parsing from Micron to OCP Plugin. * fabrics: remove unused _discover_from_json_config_file() argument * nvme: avoid unnecessary dup() + close() in io_mgmt_send() * util: remove unnecessary NULL check in cleanup_nvme_root() OBS-URL: https://build.opensuse.org/request/show/1191151 OBS-URL: https://build.opensuse.org/package/show/Base:System/nvme-cli?expand=0&rev=159
2024-08-02 10:05:26 +00:00 · 2024-08-02 10:05:26 +00:00 · f21aeef95a
commit f21aeef95a
11 changed files with 3084 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.osc
--- a/0001-docs-rename-ocp-unsupported-req-log-file.patch
+++ b/0001-docs-rename-ocp-unsupported-req-log-file.patch
@ -0,0 +1,34 @@
+From 8e940c48a032831a91cbcd5b357edb90c96506af 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 30c0efc418a4..14781341752d 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
+-- 
+2.46.0
+
--- a/18
+++ b/18
@ -0,0 +1,18 @@
+<services>
+  <service name="obs_scm" mode="manual">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/linux-nvme/nvme-cli.git</param>
+    <param name="filename">nvme-cli</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="revision">v2.10</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="changesgenerate">enable</param>
+  </service>
+  <service name="set_version" mode="manual">
+  </service>
+  <service mode="buildtime" name="tar" />
+  <service mode="buildtime" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+</services>
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+<servicedata>
+  <service name="tar_scm">
+    <param name="url">https://github.com/linux-nvme/nvme-cli.git</param>
+    <param name="changesrevision">7960a126c2cbada3c65aac1f3381539987cf54b1</param>
+  </service>
+</servicedata>
--- a/nvme-cli-2.10.obscpio
+++ b/nvme-cli-2.10.obscpio
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68d1c5e50a6b48a0ad76c07ce8d133aa9b51b5fbc91c44b13a47638565e736a9
+size 8377357
--- a/nvme-cli-2.9.1.obscpio
+++ b/nvme-cli-2.9.1.obscpio
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62292bd56a103632e3ea71b745e4e061a2a02d561e02efa89f1359bc2230d9b5
+size 7848973
--- a/4
+++ b/4
@ -0,0 +1,4 @@
+addFilter("W: systemd-service-without-service_add_pre")
+addFilter("W: systemd-service-without-service_add_post")
+addFilter("W: systemd-service-without-service_del_preun")
+addFilter("W: systemd-service-without-service_del_postun")
--- a/nvme-cli.changes
+++ b/nvme-cli.changes
--- a/nvme-cli.obsinfo
+++ b/nvme-cli.obsinfo
@ -0,0 +1,4 @@
+name: nvme-cli
+version: 2.10
+mtime: 1722585491
+commit: 7960a126c2cbada3c65aac1f3381539987cf54b1
--- a/nvme-cli.spec
+++ b/nvme-cli.spec
@ -0,0 +1,189 @@
+#
+# spec file for package nvme-cli
+#
+# Copyright (c) 2024 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+%bcond_without check
+
+Name:           nvme-cli
+Version:        2.10
+Release:        0
+Summary:        NVM Express user space tools
+License:        GPL-2.0-only
+Group:          Hardware/Other
+URL:            https://github.com/linux-nvme/nvme-cli/
+Source0:        nvme-cli-%{version}.tar.gz
+Source1:        nvme-cli-rpmlintrc
+Patch0:         0001-docs-rename-ocp-unsupported-req-log-file.patch
+BuildRequires:  asciidoc
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  libjson-c-devel
+BuildRequires:  libnvme-devel
+BuildRequires:  meson
+BuildRequires:  pkgconfig
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  xmlto
+BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(bash-completion)
+BuildRequires:  pkgconfig(libudev)
+# nvme-cli API for NBFT support.
+Provides:       nvmeof-boot-support = 0.1
+
+%systemd_ordering
+
+%description
+NVM Express (NVMe) is a direct attached storage interface. The
+nvme-cli package contains core management tools with minimal
+dependencies.
+
+%package -n     nvme-cli-regress-script
+Summary:        A small script to test the nvme binary for regressions
+Group:          Hardware/Other
+Requires:       nvme-cli
+BuildArch:      noarch
+
+%description -n nvme-cli-regress-script
+A small shell script to test the nvme binary for regressions. It requires an
+NVMe device for testing purposes. Do NOT use in a production environment.
+
+%package bash-completion
+Summary:        NVM Express user space tools bash completion
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Requires:       bash-completion
+Supplements:    (nvme-cli and bash-completion)
+BuildArch:      noarch
+
+%description bash-completion
+Optional dependency offering bash completion for NVM Express user space tools
+
+%package zsh-completion
+Summary:        NVM Express user space tools zsh completion
+Group:          System/Shells
+Requires:       %{name} = %{version}
+Requires:       zsh
+Supplements:    (nvme-cli and zsh)
+BuildArch:      noarch
+
+%description zsh-completion
+Optional dependency offering zsh completion for NVM Express user space tools
+
+%prep
+%autosetup -p1
+
+%build
+export KBUILD_BUILD_TIMESTAMP=@${SOURCE_DATE_EPOCH:-$(date +%s)}
+%meson \
+    -Dudevrulesdir=%{_udevrulesdir} \
+    -Ddracutrulesdir=%{_sysconfdir}/dracut/dracut.conf.d \
+    -Dsystemddir=%{_unitdir} \
+    -Ddocs=man \
+    -Ddocs-build=true \
+    -Dsystemctl=%{_bindir}/systemctl \
+    -Dversion-tag=%{version}
+%meson_build
+
+%if %{with check}
+%check
+%meson_test
+%endif
+
+%install
+%meson_install
+install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/hostnqn
+install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/hostid
+install -m 644 -D /dev/null %{buildroot}%{_sysconfdir}/nvme/discovery.conf
+rm %{buildroot}%{_sysconfdir}/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
+
+# for subpackage nvme-cli-regress-script:
+install -m 744 -D scripts/regress %{buildroot}%{_sbindir}/nvme-regress
+
+mkdir -p %{buildroot}%{_sbindir}
+pushd %{buildroot}%{_sbindir}
+ln -s service rcnvmefc-boot-connections
+ln -s service rcnvmf-autoconnect
+ln -s service rcnvmf-connect
+ln -s service rcnvmf-connect-nbft
+popd
+
+%define services nvmefc-boot-connections.service nvmf-autoconnect.service nvmf-connect.target nvmf-connect-nbft.service
+
+%pre
+%service_add_pre %{services} nvmf-connect@.service
+
+%post
+if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then
+	%{_bindir}/echo "Generating host NQN."
+	%{_sbindir}/nvme gen-hostnqn > %{_sysconfdir}/nvme/hostnqn
+fi
+if [ ! -s %{_sysconfdir}/nvme/hostid ]; then
+	sed -nr 's/.*:uuid:(.*?)$/\1/p' %{_sysconfdir}/nvme/hostnqn > %{_sysconfdir}/nvme/hostid
+fi
+%service_add_post %{services} nvmf-connect@.service
+
+%preun
+%service_del_preun %{services}
+
+%postun
+%service_del_postun %{services}
+
+%posttrans
+if [ -f /sys/class/fc/fc_udev_device/nvme_discovery ]; then
+	%{_bindir}/echo add > /sys/class/fc/fc_udev_device/nvme_discovery
+fi
+
+%pre -n nvme-cli-bash-completion
+if [ -d %{_datadir}/bash-completion/completions/nvme ]; then
+    rm -r %{_datadir}/bash-completion/completions/nvme;
+fi
+
+%files
+%license LICENSE
+%doc README.md
+%{_sbindir}/nvme
+%{_sbindir}/rcnvmefc-boot-connections
+%{_sbindir}/rcnvmf-autoconnect
+%{_sbindir}/rcnvmf-connect
+%{_sbindir}/rcnvmf-connect-nbft
+%{_mandir}/man1/nvme*.1*%{?ext_man}
+%{_udevrulesdir}/65-persistent-net-nbft.rules
+%{_udevrulesdir}/70-nvmf-autoconnect.rules
+%{_udevrulesdir}/71-nvmf-netapp.rules
+%{_unitdir}/nvmefc-boot-connections.service
+%{_unitdir}/nvmf-autoconnect.service
+%{_unitdir}/nvmf-connect-nbft.service
+%{_unitdir}/nvmf-connect.target
+%{_unitdir}/nvmf-connect@.service
+%dir %{_sysconfdir}/nvme/
+%ghost %{_sysconfdir}/nvme/hostnqn
+%ghost %{_sysconfdir}/nvme/hostid
+%ghost %{_sysconfdir}/nvme/discovery.conf
+
+%files -n nvme-cli-regress-script
+%{_sbindir}/nvme-regress
+
+%files bash-completion
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/nvme
+
+%files zsh-completion
+%dir %{_datadir}/zsh
+%dir %{_datadir}/zsh/site-functions
+%{_datadir}/zsh/site-functions/_nvme
+
+%changelog