diff --git a/.gitignore b/.gitignore index 1580e5b..84ef6fb 100644 --- a/.gitignore +++ b/.gitignore @@ -33,12 +33,3 @@ /nvme-cli-2.6.tar.gz /nvme-cli-2.7.1.tar.gz /nvme-cli-2.8.tar.gz -/nvme-cli-2.9.1.tar.gz -/nvme-cli-2.10.tar.gz -/nvme-cli-2.10.2.tar.gz -/nvme-cli-2.11.tar.gz -/nvme-cli-2.12.tar.gz -/nvme-cli-2.13.tar.gz -/nvme-cli-2.14.tar.gz -/nvme-cli-2.15.tar.gz -/nvme-cli-2.16.tar.gz diff --git a/99-nvme-nbft-connect.sh b/99-nvme-nbft-connect.sh deleted file mode 100644 index 1dc0324..0000000 --- a/99-nvme-nbft-connect.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -if [[ "$1" == nbft* ]] && [[ "$2" == "up" ]]; then - systemctl start nvmf-connect-nbft.service -fi diff --git a/99-nvme-nbft-no-ignore-carrier.conf b/99-nvme-nbft-no-ignore-carrier.conf deleted file mode 100644 index 4f19515..0000000 --- a/99-nvme-nbft-no-ignore-carrier.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Boot from NVMe over TCP (NBFT) -# -# For NVMe/TCP connections that provide namespaces containing rootfs -# it is crucial to react on carrier events and reconnect any missing -# NVMe/TCP connections as defined in the ACPI NBFT table. A custom -# /usr/lib/NetworkManager/dispatcher.d/99-nvme-nbft-connect.sh hook -# will respawn nvmf-connect-nbft.service on such occasion. - -[device-nbft-no-ignore-carrier] - -# only affects nbft0, nbft1, ... interfaces -match-device=interface-name:nbft* - -# react on link up/down events -ignore-carrier=no diff --git a/nvme-cli.spec b/nvme-cli.spec index 5fa7a3a..2472c15 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -1,20 +1,16 @@ # RHEL 8 compatibility %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}} -%global nmlibdir %{_prefix}/lib/NetworkManager - Name: nvme-cli -Version: 2.16 +Version: 2.8 Release: 1%{?dist} Summary: NVMe management command line interface License: GPL-2.0-only URL: https://github.com/linux-nvme/nvme-cli Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz -Source1: 99-nvme-nbft-connect.sh -Source2: 99-nvme-nbft-no-ignore-carrier.conf -BuildRequires: meson >= 0.53 +BuildRequires: meson >= 0.50.0 BuildRequires: gcc gcc-c++ BuildRequires: systemd-devel BuildRequires: systemd-rpm-macros @@ -24,15 +20,14 @@ BuildRequires: openssl-devel BuildRequires: kernel-headers %endif -BuildRequires: libnvme-devel >= 1.16.1 -BuildRequires: json-c-devel >= 0.14 +BuildRequires: libnvme-devel >= 1.8 +BuildRequires: json-c-devel >= 0.13 BuildRequires: asciidoc BuildRequires: xmlto Requires: util-linux - %description nvme-cli provides NVM-Express user space tooling for Linux. @@ -41,17 +36,13 @@ nvme-cli provides NVM-Express user space tooling for Linux. %build -%meson -Dudevrulesdir=%{_udevrulesdir} -Dsystemddir=%{_unitdir} -Dpdc-enabled=false -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir} +%meson -Dudevrulesdir=%{_udevrulesdir} -Dsystemddir=%{_unitdir} -Dpdc-enabled=true -Ddocs=all -Ddocs-build=true -Dhtmldir=%{_pkgdocdir} %meson_build %install %meson_install %{__install} -pm 644 README.md %{buildroot}%{_pkgdocdir} -mkdir -p $RPM_BUILD_ROOT%{nmlibdir}/dispatcher.d -mkdir -p $RPM_BUILD_ROOT%{nmlibdir}/conf.d -%{__install} -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{nmlibdir}/dispatcher.d/ -%{__install} -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/ # hostid and hostnqn are supposed to be unique per machine. We obviously # can't package them. @@ -68,30 +59,6 @@ mv %{buildroot}%{_pkgdocdir}/nvme %{buildroot}%{_pkgdocdir}/html rm -rf %{buildroot}%{_pkgdocdir}/nvme -%post -# https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_systemd -%systemd_post nvmefc-boot-connections.service -%systemd_post nvmf-autoconnect.service -%systemd_post nvmf-connect@.service -%systemd_post nvmf-connect-nbft.service -if [ -S /run/udev/control ]; then - udevadm control --reload - udevadm trigger -fi - -%preun -%systemd_preun nvmefc-boot-connections.service -%systemd_preun nvmf-autoconnect.service -%systemd_preun nvmf-connect@.service -%systemd_preun nvmf-connect-nbft.service - -%postun -%systemd_postun nvmefc-boot-connections.service -%systemd_postun nvmf-autoconnect.service -%systemd_postun nvmf-connect@.service -%systemd_postun nvmf-connect-nbft.service - - %files %license LICENSE %doc %{_pkgdocdir} @@ -108,72 +75,12 @@ fi %{_unitdir}/nvmf-connect-nbft.service %{_udevrulesdir}/65-persistent-net-nbft.rules %{_udevrulesdir}/70-nvmf-autoconnect.rules -%{_udevrulesdir}/70-nvmf-keys.rules %{_udevrulesdir}/71-nvmf-netapp.rules -%{_udevrulesdir}/71-nvmf-vastdata.rules -%{_udevrulesdir}/71-nvmf-hpe.rules # Do not install the dracut rule yet. See rhbz 1742764 # /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf -%{nmlibdir}/dispatcher.d/99-nvme-nbft-connect.sh -%{nmlibdir}/conf.d/99-nvme-nbft-no-ignore-carrier.conf %changelog -* Thu Dec 04 2025 Tomas Bzatek - 2.16-1 -- Update to 2.16 - -* Fri Aug 15 2025 Tomas Bzatek - 2.15-2 -- Fix nvme-list JSON output compatibility -- Rename 71-nvme-hpe.rules to 71-nvmf-hpe.rules - -* Fri Jul 25 2025 Tomas Bzatek - 2.15-1 -- Update to 2.15 - -* Thu Jul 24 2025 Fedora Release Engineering - 2.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Wed Jul 09 2025 Tomas Bzatek - 2.14-1 -- Update to 2.14 -- Disable Persistent Discovery Controllers by default - -* Fri Apr 11 2025 Tomas Bzatek - 2.13-1 -- Update to 2.13 - -* Mon Mar 17 2025 Tomas Bzatek - 2.12-1 -- Update to 2.12 - -* Tue Feb 04 2025 Tomas Bzatek - 2.11-3 -- Add systemd units scriptlets -- Reload udevd after installing udev rules - -* Fri Jan 17 2025 Fedora Release Engineering - 2.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Oct 31 2024 Tomas Bzatek - 2.11-1 -- Update to 2.11 - -* Mon Aug 26 2024 Tomas Bzatek - 2.10.2-2 -- Install NetworkManager override for nbft interfaces -- Rename reconnect NetworkManager hook to 99-nvme-nbft-connect.sh - -* Mon Aug 05 2024 Tomas Bzatek - 2.10.2-1 -- Update to 2.10.2 - -* Mon Aug 05 2024 Tomas Bzatek - 2.10-1 -- Update to 2.10 - -* Thu Jul 18 2024 Fedora Release Engineering - 2.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 03 2024 Tomas Bzatek - 2.9.1-2 -- Install custom nvmf-connect-nbft.sh NetworkManager hook - -* Fri May 03 2024 Tomas Bzatek - 2.9.1-1 -- Update to 2.9.1 - -* Tue Apr 23 2024 Tomas Bzatek - 2.8-2 -- Harden the systemd units - * Wed Feb 14 2024 Tomas Bzatek - 2.8-1 - Update to 2.8 diff --git a/sources b/sources index e58ea56..5f3c195 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nvme-cli-2.16.tar.gz) = 507018ff41832574bef5b88ea6a17336b9792c54f8e5c619d041bce23124e1d6d5e5e824407f46d4f1b4d6899125885eb14289f3399e61c7e7a59a603f1635e2 +SHA512 (nvme-cli-2.8.tar.gz) = 1be0bed4e1bf8a25229f301c2b00b78d2de4eaf8ff2b815fa75e44dd35ddd7787604152bdf00696130df3281206a734c5f408c3f2127440e05c2e4b1cdbb79d4