azl3: Upgrade nvme-cli to 2.8, add libnvme 1.8 (#7986)

Co-authored-by: Adit Jha <aditjha@microsoft.com>
This commit is contained in:
CBL-Mariner-Bot 2024-02-22 15:28:06 -08:00 коммит произвёл GitHub
Родитель dbf21ffb8f
Коммит f37607b8f4
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
7 изменённых файлов: 215 добавлений и 19 удалений

2
SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md сгенерированный

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -700,6 +700,7 @@
"libnotify",
"libntlm",
"libnumbertext",
"libnvme",
"liboauth",
"libodfgen",
"libofa",

Просмотреть файл

@ -0,0 +1,5 @@
{
"Signatures": {
"libnvme-1.8.tar.gz": "d59939a280eec41eb7a716e1681d0d0c612099385204ffb55d07134a6be08d75"
}
}

172
SPECS/libnvme/libnvme.spec Normal file
Просмотреть файл

@ -0,0 +1,172 @@
Summary: Linux-native nvme device management library
Name: libnvme
Version: 1.8
Release: 1%{?dist}
License: LGPL-2.1-or-later
URL: https://github.com/linux-nvme/libnvme
Source0: https://github.com/linux-nvme/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: dbus-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: json-c-devel >= 0.13
BuildRequires: keyutils-libs-devel
BuildRequires: meson >= 0.50
BuildRequires: openssl-devel
BuildRequires: python3-devel
BuildRequires: swig
%description
Provides type definitions for NVMe specification structures,
enumerations, and bit fields, helper functions to construct,
dispatch, and decode commands and payloads, and utilities to connect,
scan, and manage nvme devices on a Linux system.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package provides header files to include and libraries to link with
for Linux-native nvme device management.
%package -n python3-libnvme
Summary: Python3 bindings for libnvme
Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: python3-nvme = %{version}-%{release}
Obsoletes: python3-nvme < 1.0~rc7
%{?python_provide:%python_provide python3-libnvme}
%description -n python3-libnvme
This package contains Python bindings for libnvme.
%prep
%autosetup -p1 -n %{name}-%{version}
%build
%meson -Dpython=enabled -Dlibdbus=enabled
%meson_build
%install
%meson_install
%ldconfig_scriptlets
%files
%license COPYING ccan/licenses/*
%{_libdir}/libnvme.so.1
%{_libdir}/libnvme.so.1.8.0
%{_libdir}/libnvme-mi.so.1
%{_libdir}/libnvme-mi.so.1.8.0
%files devel
%{_libdir}/libnvme.so
%{_libdir}/libnvme-mi.so
%{_includedir}/libnvme.h
%{_includedir}/libnvme-mi.h
%dir %{_includedir}/nvme
%{_includedir}/nvme/*.h
%{_libdir}/pkgconfig/*.pc
%files -n python3-libnvme
%dir %{python3_sitearch}/libnvme
%{python3_sitearch}/libnvme/*
%changelog
* Wed Feb 21 2024 Adit Jha <aditjha@microsoft.com> - 1.8-1
- Initial CBL-Mariner import from Fedora 39 (license: MIT). License verified.
* Wed Feb 14 2024 Tomas Bzatek <tbzatek@redhat.com> - 1.8-1
- Upstream v1.8 release
* Fri Feb 09 2024 Tomas Bzatek <tbzatek@redhat.com> - 1.7.1-4
- nbft: Fix SSNS HFI indexes parsing
- cleanup: Explicitly initialize auto-cleanup variables
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Dec 28 2023 Tomas Bzatek <tbzatek@redhat.com> - 1.7.1-1
- Upstream v1.7.1 release
* Tue Oct 24 2023 Tomas Bzatek <tbzatek@redhat.com> - 1.6-2
- Backport stack smashing fixes (#2245707)
* Fri Sep 29 2023 Tomas Bzatek <tbzatek@redhat.com> - 1.6-1
- Upstream v1.6 release
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 04 2023 Python Maint <python-maint@redhat.com> - 1.5-2
- Rebuilt for Python 3.12
* Tue Jul 04 2023 Tomas Bzatek <tbzatek@redhat.com> - 1.5-1
- Upstream v1.5 release
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1.4-3
- Rebuilt for Python 3.12
* Thu Apr 20 2023 Tomas Bzatek <tbzatek@redhat.com> - 1.4-2
- Backport the NBFT parser from git master
* Mon Apr 03 2023 Tomas Bzatek <tbzatek@redhat.com> - 1.4-1
- Upstream v1.4 release
* Tue Jan 31 2023 Tomas Bzatek <tbzatek@redhat.com> - 1.3-1
- Upstream v1.3 release
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Nov 01 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.2-1
- Upstream v1.2 release
* Fri Aug 05 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.1-1
- Upstream v1.1 release
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1~rc0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 15 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.1~rc0-1
- Upstream v1.1 Release Candidate 0
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0-2
- Rebuilt for Python 3.11
* Mon Apr 11 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0-1
- Upstream v1.0 release
* Fri Apr 01 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc8-1
- Upstream v1.0 Release Candidate 8
* Wed Mar 23 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc7-1
- Upstream v1.0 Release Candidate 7
- Renamed python3-nvme subpackage to python3-libnvme
* Mon Mar 14 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc6-1
- Upstream v1.0 Release Candidate 6
* Fri Mar 04 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc5-1
- Upstream v1.0 Release Candidate 5
* Mon Feb 28 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc4-1
- Upstream v1.0 Release Candidate 4
* Fri Feb 11 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc3-1
- Upstream v1.0 Release Candidate 3
* Tue Feb 01 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc2-1
- Upstream v1.0 Release Candidate 2
* Thu Jan 27 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc1-1
- Upstream v1.0 Release Candidate 1
* Mon Jan 17 2022 Tomas Bzatek <tbzatek@redhat.com> - 1.0~rc0-1
- Upstream v1.0 Release Candidate 0
* Wed Oct 20 2021 Tomas Bzatek <tbzatek@redhat.com> - 0.0.1-1.git1fe38d6
- Initial packaging

Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"nvme-cli-1.16.tar.gz": "40f741020ab5c490374901cd2c0c9b6cf98dd5ff5f182517a0aec12c0e9aef55"
}
}
"Signatures": {
"nvme-cli-2.8.tar.gz": "0743d9188792a87d39187ae5e5cb31e8f46cca8c6f100547c50ec0dd659d2531"
}
}

Просмотреть файл

@ -1,15 +1,20 @@
Summary: NVM-Express user space tooling for Linux
Name: nvme-cli
Version: 1.16
Release: 2%{?dist}
Version: 2.8
Release: 1%{?dist}
License: GPLv2
Vendor: Microsoft Corporation
Distribution: Azure Linux
Group: Applications/System
URL: https://github.com/linux-nvme/nvme-cli
Source0: https://github.com/linux-nvme/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source0: https://github.com/linux-nvme/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: asciidoc
BuildRequires: gcc
BuildRequires: make
BuildRequires: json-c-devel
BuildRequires: libnvme-devel
BuildRequires: meson
BuildRequires: xmlto
Requires(post): systemd
Requires(post): systemd-udev
Requires(post): util-linux
@ -18,13 +23,14 @@ Requires(post): util-linux
NVM-Express user space tooling for Linux
%prep
%setup -q
%autosetup -p1 -n %{name}-%{version}
%build
make CFLAGS="%{build_cflags} -std=gnu99 -I."
%meson -Dudevrulesdir=%{_sysconfdir}/udev/rules.d -Dsystemddir=%{_libdir}/systemd/system -Dpdc-enabled=true
%meson_build
%install
make install PREFIX=%{_prefix} DESTDIR=%{buildroot}
%meson_install
%files
%defattr(-,root,root)
@ -32,18 +38,17 @@ make install PREFIX=%{_prefix} DESTDIR=%{buildroot}
%{_sbindir}/nvme
%{_datadir}/bash-completion/completions/nvme
%{_datadir}/zsh/site-functions/_nvme
%{_mandir}/man1/nvme*.1*
%dir %{_sysconfdir}/nvme
%{_sysconfdir}/nvme/hostnqn
%{_sysconfdir}/nvme/hostid
%{_sysconfdir}/nvme/discovery.conf
%{_sysconfdir}/udev/rules.d/65-persistent-net-nbft.rules
%{_sysconfdir}/udev/rules.d/70-nvmf-autoconnect.rules
%{_sysconfdir}/udev/rules.d/71-nvmf-iopolicy-netapp.rules
%{_sysconfdir}/udev/rules.d/71-nvmf-netapp.rules
%{_libdir}/dracut/dracut.conf.d/*
%{_libdir}/systemd/system/nvmf-connect@.service
%{_libdir}/systemd/system/nvmefc-boot-connections.service
%{_libdir}/systemd/system/nvmf-connect.target
%{_libdir}/systemd/system/nvmf-autoconnect.service
%{_libdir}/systemd/system/nvmf-connect-nbft.service
%post
if [ $1 -eq 1 ]; then # 1 : This package is being installed for the first time
@ -60,6 +65,9 @@ if [ $1 -eq 1 ]; then # 1 : This package is being installed for the first time
fi
%changelog
* Wed Feb 21 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.8-1
- Auto-upgrade to 2.8
* Fri Mar 25 2022 Andrew Phelps <anphel@microsoft.com> - 1.16-2
- Remove check tests which fail to run properly on daily build machines
- Update spec with changes based on upstream github project's nvme.spec.in

Просмотреть файл

@ -10286,6 +10286,16 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "libnvme",
"version": "1.8",
"downloadUrl": "https://github.com/linux-nvme/libnvme/archive/refs/tags/v1.8.tar.gz"
}
}
},
{
"component": {
"type": "other",
@ -14313,8 +14323,8 @@
"type": "other",
"other": {
"name": "nvme-cli",
"version": "1.16",
"downloadUrl": "https://github.com/linux-nvme/nvme-cli/archive/v1.16.tar.gz"
"version": "2.8",
"downloadUrl": "https://github.com/linux-nvme/nvme-cli/archive/v2.8.tar.gz"
}
}
},
@ -30567,4 +30577,4 @@
}
],
"Version": 1
}
}