Sync from SUSE:SLFO:Main nvme-cli revision c1b1b72707469b566f970709ec975247
This commit is contained in:
commit
8186565877
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -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
|
||||
37
0100-harden_nvmf-connect@.service.patch
Normal file
37
0100-harden_nvmf-connect@.service.patch
Normal file
@ -0,0 +1,37 @@
|
||||
From a4fe9c98d74447ca96ba59610368486640fdbfd6 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Wagner <dwagner@suse.de>
|
||||
Date: Fri, 29 Sep 2023 14:28:16 +0200
|
||||
Subject: [PATCH] systemd hardening effort
|
||||
|
||||
https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
|
||||
|
||||
Apply the recommended hardening settings but without
|
||||
"ProtectKernelTunables=true" as we need write access to /sys.
|
||||
|
||||
Signed-off-by: Daniel Wagner <dwagner@suse.de>
|
||||
---
|
||||
nvmf-autoconnect/systemd/nvmf-connect@.service.in | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service.in b/nvmf-autoconnect/systemd/nvmf-connect@.service.in
|
||||
index 5ba708..129cb4 100644
|
||||
--- a/nvmf-autoconnect/systemd/nvmf-connect@.service.in
|
||||
+++ b/nvmf-autoconnect/systemd/nvmf-connect@.service.in
|
||||
@@ -11,6 +11,14 @@ PartOf=nvmf-connect.target
|
||||
Requires=nvmf-connect.target
|
||||
|
||||
[Service]
|
||||
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
|
||||
+ProtectSystem=full
|
||||
+ProtectHome=true
|
||||
+ProtectHostname=true
|
||||
+ProtectKernelModules=true
|
||||
+ProtectKernelLogs=true
|
||||
+ProtectControlGroups=true
|
||||
+RestrictRealtime=true
|
||||
Type=simple
|
||||
Environment="CONNECT_ARGS=%i"
|
||||
ExecStart=/bin/sh -c "@SBINDIR@/nvme connect-all --context=autoconnect --quiet `/bin/echo -e '${CONNECT_ARGS}'`"
|
||||
--
|
||||
2.42.0
|
||||
|
||||
18
_service
Normal file
18
_service
Normal file
@ -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.8</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>
|
||||
6
_servicedata
Normal file
6
_servicedata
Normal file
@ -0,0 +1,6 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/linux-nvme/nvme-cli.git</param>
|
||||
<param name="changesrevision">43b716b982da3df1cf8c4658f7c31b0fe28d377b</param>
|
||||
</service>
|
||||
</servicedata>
|
||||
BIN
nvme-cli-2.8.obscpio
(Stored with Git LFS)
Normal file
BIN
nvme-cli-2.8.obscpio
(Stored with Git LFS)
Normal file
Binary file not shown.
4
nvme-cli-rpmlintrc
Normal file
4
nvme-cli-rpmlintrc
Normal file
@ -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")
|
||||
2465
nvme-cli.changes
Normal file
2465
nvme-cli.changes
Normal file
File diff suppressed because it is too large
Load Diff
4
nvme-cli.obsinfo
Normal file
4
nvme-cli.obsinfo
Normal file
@ -0,0 +1,4 @@
|
||||
name: nvme-cli
|
||||
version: 2.8
|
||||
mtime: 1707903840
|
||||
commit: 43b716b982da3df1cf8c4658f7c31b0fe28d377b
|
||||
190
nvme-cli.spec
Normal file
190
nvme-cli.spec
Normal file
@ -0,0 +1,190 @@
|
||||
#
|
||||
# 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.8
|
||||
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
|
||||
# downstream patches
|
||||
Patch100: 0100-harden_nvmf-connect@.service.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 \
|
||||
%{?_with_docs_build:-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
|
||||
Loading…
x
Reference in New Issue
Block a user