ed7b7d75d0
Resolves: RHEL-37603 Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
290 lines
9.3 KiB
RPMSpec
290 lines
9.3 KiB
RPMSpec
# RHEL 8 compatibility
|
|
%{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}}
|
|
|
|
Name: nvme-cli
|
|
Version: 2.9.1
|
|
Release: 3%{?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: nvmf-connect-nbft.sh
|
|
|
|
Patch0: 0001-Revert-fabrics-Use-corresponding-hostid-when-hostnqn.patch
|
|
Patch1: nvme-cli-2.10-nbft-discovery.patch
|
|
Patch2: add-missing-include.patch
|
|
|
|
BuildRequires: meson >= 0.50.0
|
|
BuildRequires: gcc gcc-c++
|
|
BuildRequires: systemd-devel
|
|
BuildRequires: systemd-rpm-macros
|
|
BuildRequires: zlib-devel
|
|
BuildRequires: openssl-devel
|
|
%if (0%{?rhel} == 0) || (0%{?rhel} > 9)
|
|
BuildRequires: kernel-headers
|
|
%endif
|
|
|
|
BuildRequires: libnvme-devel >= 1.9-4
|
|
BuildRequires: json-c-devel >= 0.13
|
|
|
|
BuildRequires: asciidoc
|
|
BuildRequires: xmlto
|
|
|
|
Requires: util-linux
|
|
|
|
|
|
%description
|
|
nvme-cli provides NVM-Express user space tooling for Linux.
|
|
|
|
%prep
|
|
%autosetup -p1 -n %{name}-%{version_no_tilde}
|
|
|
|
|
|
%build
|
|
%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%{_sysconfdir}/NetworkManager/dispatcher.d
|
|
%{__install} -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
|
|
|
|
# Do not install the dracut rule yet. See rhbz 1742764
|
|
rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
|
|
|
|
# Move html docs into the right place
|
|
mv %{buildroot}%{_pkgdocdir}/nvme %{buildroot}%{_pkgdocdir}/html
|
|
rm -rf %{buildroot}%{_pkgdocdir}/nvme
|
|
|
|
|
|
%files
|
|
%license LICENSE
|
|
%doc %{_pkgdocdir}
|
|
%{_sbindir}/nvme
|
|
%{_mandir}/man1/nvme*.gz
|
|
%{_datadir}/bash-completion/completions/nvme
|
|
%{_datadir}/zsh/site-functions/_nvme
|
|
%dir %{_sysconfdir}/nvme
|
|
%config(noreplace) %{_sysconfdir}/nvme/discovery.conf
|
|
%{_unitdir}/nvmefc-boot-connections.service
|
|
%{_unitdir}/nvmf-autoconnect.service
|
|
%{_unitdir}/nvmf-connect.target
|
|
%{_unitdir}/nvmf-connect@.service
|
|
%{_unitdir}/nvmf-connect-nbft.service
|
|
%{_udevrulesdir}/65-persistent-net-nbft.rules
|
|
%{_udevrulesdir}/70-nvmf-autoconnect.rules
|
|
%{_udevrulesdir}/71-nvmf-netapp.rules
|
|
# Do not install the dracut rule yet. See rhbz 1742764
|
|
# /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf
|
|
%{_sysconfdir}/NetworkManager/dispatcher.d/nvmf-connect-nbft.sh
|
|
|
|
%post
|
|
if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then
|
|
if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then
|
|
echo $(nvme gen-hostnqn) > %{_sysconfdir}/nvme/hostnqn
|
|
fi
|
|
if [ ! -s %{_sysconfdir}/nvme/hostid ]; then
|
|
echo $(nvme show-hostnqn | sed 's/^.*uuid://') > %{_sysconfdir}/nvme/hostid
|
|
fi
|
|
|
|
# apply udev and systemd changes that we did
|
|
if [ $1 -eq 1 ]; then
|
|
systemctl enable nvmefc-boot-connections
|
|
fi
|
|
systemctl daemon-reload
|
|
udevadm control --reload-rules && udevadm trigger
|
|
exit 0
|
|
fi
|
|
|
|
%changelog
|
|
* Fri Jul 26 2024 Maurizio Lombardi <mlombard@redhat.com> - 2.9.1-3
|
|
- Fix RHEL-37603 (NBFT discovery support)
|
|
|
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.9.1-2
|
|
- Bump release for June 2024 mass rebuild
|
|
|
|
* Fri May 03 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.9.1-1
|
|
- Update to 2.9.1
|
|
- Install custom nvmf-connect-nbft.sh NetworkManager hook
|
|
|
|
* Tue Apr 23 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.8-2
|
|
- Harden the systemd units
|
|
|
|
* Wed Feb 14 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.8-1
|
|
- Update to 2.8
|
|
|
|
* Fri Feb 09 2024 Tomas Bzatek <tbzatek@redhat.com> - 2.7.1-4
|
|
- Lower the verbosity of TP4126 hostnqn-hostid consistency checks
|
|
|
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-3
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
* Thu Dec 28 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.7.1-1
|
|
- Update to 2.7.1
|
|
|
|
* Fri Sep 29 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.6-1
|
|
- Update to 2.6
|
|
|
|
* Thu Aug 17 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.5-4
|
|
- Mark /etc/nvme/discovery.conf as (noreplace)
|
|
|
|
* Mon Aug 14 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.5-3
|
|
- Backport 'fabrics: Use corresponding hostid when hostnqn is generated'
|
|
|
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
|
|
* Tue Jul 04 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.5-1
|
|
- Update to 2.5
|
|
|
|
* Thu Apr 20 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.4-2
|
|
- Backport the NBFT support from git master
|
|
|
|
* Mon Apr 03 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.4-1
|
|
- Update to 2.4
|
|
|
|
* Wed Feb 01 2023 Tomas Bzatek <tbzatek@redhat.com> - 2.3-1
|
|
- Update to 2.3
|
|
|
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
|
|
* Fri Nov 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.2.1-1
|
|
- Update to 2.2.1
|
|
|
|
* Tue Nov 01 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.2-1
|
|
- Update to 2.2
|
|
|
|
* Fri Aug 19 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.1.2-1
|
|
- Update to 2.1.2
|
|
|
|
* Fri Aug 05 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.1.1-1
|
|
- Update to 2.1.1
|
|
|
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1~rc0-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
|
|
* Fri Jul 15 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.1~rc0-1
|
|
- Update to 2.1-rc0
|
|
- Drop the hostnqn generate scriptlet (#2065886)
|
|
|
|
* Mon Apr 11 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0-1
|
|
- Update to 2.0
|
|
|
|
* Mon Apr 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0~rc8-1
|
|
- Update to 2.0-rc8
|
|
- Added scriptlet to generate /etc/nvme/hostnqn and hostid files (#2065886)
|
|
|
|
* Tue Mar 15 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0~rc6-1
|
|
- Update to 2.0-rc6
|
|
|
|
* Fri Mar 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 2.0~rc5-1
|
|
- Update to 2.0-rc5
|
|
|
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-5
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-4
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-3
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
|
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
|
|
* Sat Apr 25 2020 luto@kernel.org - 1.11.1-1
|
|
- Update to 1.11
|
|
|
|
* Thu Mar 19 2020 luto@kernel.org - 1.10.1-1
|
|
- Update to 1.10.1
|
|
|
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
|
* Wed Oct 02 2019 luto@kernel.org - 1.9-1
|
|
- Update to 1.9
|
|
- Certain fabric functionality may not work yet due to missing dracut
|
|
support and missing hostid and hostnqn configuration.
|
|
|
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
|
* Mon Apr 15 2019 luto@kernel.org - 1.8.1-1
|
|
- Update to 1.8.1-1.
|
|
- Remove a build hack.
|
|
|
|
* Sun Feb 24 2019 luto@kernel.org - 1.7-2
|
|
- Create /etc/nvme
|
|
|
|
* Sun Feb 24 2019 luto@kernel.org - 1.7-1
|
|
- Bump to 1.7
|
|
- Clean up some trivial rpmlint complaints
|
|
|
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
|
* Tue Jul 24 2018 luto@kernel.org - 1.6-1
|
|
- Update to 1.6
|
|
|
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-5
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-4
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
|
* Wed Nov 22 2017 luto@kernel.org - 1.4-1
|
|
- Update to 1.4
|
|
|
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-3
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
|
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
|
* Mon May 22 2017 luto@kernel.org - 1.3-1
|
|
- Update to 1.3
|
|
|
|
* Wed Apr 19 2017 luto@kernel.org - 1.2-2
|
|
- Update to 1.2
|
|
- 1.2-1 never existed
|
|
|
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
|
* Wed Feb 01 2017 luto@kernel.org - 1.1-1
|
|
- Update to 1.1
|
|
|
|
* Sun Nov 20 2016 luto@kernel.org - 1.0-1
|
|
- Update to 1.0
|
|
|
|
* Mon Oct 31 2016 luto@kernel.org - 0.9-1
|
|
- Update to 0.9
|
|
|
|
* Thu Jun 30 2016 luto@kernel.org - 0.8-1
|
|
- Update to 0.8
|
|
|
|
* Tue May 31 2016 luto@kernel.org - 0.7-1
|
|
- Update to 0.7
|
|
|
|
* Fri Mar 18 2016 luto@kernel.org - 0.5-1
|
|
- Update to 0.5
|
|
|
|
* Sun Mar 06 2016 luto@kernel.org - 0.4-1
|
|
- Update to 0.4
|
|
|
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.2-3.20160112gitbdbb4da
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
|
|
* Wed Jan 20 2016 luto@kernel.org - 0.2-2.20160112gitbdbb4da
|
|
- Update to new upstream commit, fixing #49. "nvme list" now works.
|
|
|
|
* Wed Jan 13 2016 luto@kernel.org - 0.2-1.20160112gitde3e0f1
|
|
- Initial import.
|