Accepting request 1099861 from home:anag:branches:Base:System

Fix nvme-cli in Factory

- Fix FTBFS: Remove nvme-cli-2.4.obscpio and add instead nvme-cli-2.5.obscpio
- Update patch 0100-harden_nvmf-connect@.service.patch
- Update installation path for regress script.

OBS-URL: https://build.opensuse.org/request/show/1099861
OBS-URL: https://build.opensuse.org/package/show/Base:System/nvme-cli?expand=0&rev=138
This commit is contained in:
Daniel Wagner 2023-07-21 09:12:55 +00:00 committed by Git OBS Bridge
parent ae3c565f6c
commit 18544c9813
5 changed files with 13 additions and 5 deletions

View File

@ -26,4 +26,5 @@ Signed-off-by: Daniel Wagner <dwagner@suse.de>
+RestrictRealtime=true
Type=simple
Environment="CONNECT_ARGS=%i"
ExecStart=/bin/sh -c "@SBINDIR@/nvme connect-all --quiet `/bin/echo -e '${CONNECT_ARGS}'`"
ExecStart=/bin/sh -c "@SBINDIR@/nvme connect-all --context=autoconnect --quiet `/bin/echo -e '${CONNECT_ARGS}'`"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e777113a11fdab3bce88da863a21d1b00133fdbbd3d34b6167aec856f5cb289
size 7025677

3
nvme-cli-2.5.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81fd9b4a80fada23b24d75d34bcfd98d5e0c6d45ba808b2851bb3765b8319583
size 7318029

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jul 21 07:45:38 UTC 2023 - Ana Guerrero <ana.guerrero@suse.com>
- Fix FTBFS: Remove nvme-cli-2.4.obscpio and add instead nvme-cli-2.5.obscpio
- Update patch 0100-harden_nvmf-connect@.service.patch
- Update installation path for regress script.
-------------------------------------------------------------------
Thu Jul 06 09:43:48 UTC 2023 - Daniel Wagner <daniel.wagner@suse.com>

View File

@ -98,7 +98,7 @@ 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 regress %{buildroot}%{_sbindir}/nvme-regress
install -m 744 -D scripts/regress %{buildroot}%{_sbindir}/nvme-regress
mkdir -p %{buildroot}%{_sbindir}
pushd %{buildroot}%{_sbindir}