From ccb940fa3de23b112b8cfdeab98bed7b7283af0e Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 19 Aug 2022 16:28:47 +0200 Subject: [PATCH 1/7] * Fri Aug 19 2022 Tomas Bzatek - 2.1.2-1 - Update to 2.1.2 --- .gitignore | 1 + nvme-cli.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5d7db6f..1c281ce 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /nvme-cli-2.0.tar.gz /nvme-cli-2.1-rc0.tar.gz /nvme-cli-2.1.1.tar.gz +/nvme-cli-2.1.2.tar.gz diff --git a/nvme-cli.spec b/nvme-cli.spec index 18bfc32..0914874 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -1,5 +1,5 @@ Name: nvme-cli -Version: 2.1.1 +Version: 2.1.2 Release: 1%{?dist} Summary: NVMe management command line interface @@ -77,6 +77,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme %changelog +* Fri Aug 19 2022 Tomas Bzatek - 2.1.2-1 +- Update to 2.1.2 + * Fri Aug 05 2022 Tomas Bzatek - 2.1.1-1 - Update to 2.1.1 diff --git a/sources b/sources index 1953084..23e468f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nvme-cli-2.1.1.tar.gz) = 61a8e7c0ae8da082ac0cda2fdf61ffe8d83ed5d4ee31640bde89fde929ba3fe6d788950bd232630af2c7fc5f3563f05f47f350e005c8556691e5aede73c88d74 +SHA512 (nvme-cli-2.1.2.tar.gz) = 2162a6967a221a4ae7e0261748c26a10ff43d5b592039e29578d8310cf176428d528c2d510c0b58419b70bd6d28f4d2c77f0cd27606d87079c64289d5d14f930 From d1eddcdd24704518c5c39b167aa2b9f04dedfccc Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 1 Nov 2022 14:40:37 +0100 Subject: [PATCH 2/7] * Tue Nov 01 2022 Tomas Bzatek - 2.2-1 - Update to 2.2 --- .gitignore | 1 + nvme-cli.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1c281ce..9398b26 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /nvme-cli-2.1-rc0.tar.gz /nvme-cli-2.1.1.tar.gz /nvme-cli-2.1.2.tar.gz +/nvme-cli-2.2.tar.gz diff --git a/nvme-cli.spec b/nvme-cli.spec index 0914874..fb03539 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -1,5 +1,5 @@ Name: nvme-cli -Version: 2.1.2 +Version: 2.2 Release: 1%{?dist} Summary: NVMe management command line interface @@ -7,8 +7,7 @@ License: GPLv2 URL: https://github.com/linux-nvme/nvme-cli Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz -BuildRequires: meson >= 0.47.0 -BuildRequires: libuuid-devel +BuildRequires: meson >= 0.48.0 BuildRequires: gcc gcc-c++ BuildRequires: systemd-devel BuildRequires: zlib-devel @@ -40,6 +39,7 @@ nvme-cli provides NVM-Express user space tooling for Linux. %install %meson_install +%{__install} -pm 644 README.md %{buildroot}%{_pkgdocdir} # hostid and hostnqn are supposed to be unique per machine. We obviously # can't package them. @@ -58,7 +58,6 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme %files %license LICENSE -%doc README.md %doc %{_pkgdocdir} %{_sbindir}/nvme %{_mandir}/man1/nvme*.gz @@ -77,6 +76,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme %changelog +* Tue Nov 01 2022 Tomas Bzatek - 2.2-1 +- Update to 2.2 + * Fri Aug 19 2022 Tomas Bzatek - 2.1.2-1 - Update to 2.1.2 diff --git a/sources b/sources index 23e468f..a062355 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nvme-cli-2.1.2.tar.gz) = 2162a6967a221a4ae7e0261748c26a10ff43d5b592039e29578d8310cf176428d528c2d510c0b58419b70bd6d28f4d2c77f0cd27606d87079c64289d5d14f930 +SHA512 (nvme-cli-2.2.tar.gz) = a3f572bb1bbd4ba56eb3a4c1e1aa95c4ed5e7bc1d5adb80125fe54a894c470838cad5457a0420692deb39f4302cefc4fc1eab92c08c134faabe03a654b9542f4 From 0b4730557f71a89a21ce381a08a25777749435e1 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 1 Nov 2022 14:52:09 +0100 Subject: [PATCH 3/7] Requires libnvme-devel-1.2 Although not required by meson, compilation actually fails on removed uuid symbols. --- nvme-cli.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvme-cli.spec b/nvme-cli.spec index fb03539..a92b8cd 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -13,7 +13,7 @@ BuildRequires: systemd-devel BuildRequires: zlib-devel BuildRequires: openssl-devel -BuildRequires: libnvme-devel >= 1.1 +BuildRequires: libnvme-devel >= 1.2 BuildRequires: json-c-devel >= 0.14 BuildRequires: python3-nose2 BuildRequires: python3-mypy From 058d9ab5993629baecec59a9bb2525bfbad2e960 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 1 Nov 2022 15:43:48 +0100 Subject: [PATCH 4/7] Require libuuid Also libuuid seems to be still in use despite the release notes and the meson requirements state otherwise. --- nvme-cli.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nvme-cli.spec b/nvme-cli.spec index a92b8cd..52775f9 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -8,6 +8,7 @@ URL: https://github.com/linux-nvme/nvme-cli Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz BuildRequires: meson >= 0.48.0 +BuildRequires: libuuid-devel BuildRequires: gcc gcc-c++ BuildRequires: systemd-devel BuildRequires: zlib-devel From 1cc90754b7e6a1ca3748031b8088c03f34157a32 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 1 Nov 2022 17:05:47 +0100 Subject: [PATCH 5/7] CentOS Stream 8+9 compability It is still possible to build this package for RHEL/CentOS (Stream) 8 and 9 given that recent libnvme is built the same way (e.g. in Copr). --- nvme-cli.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nvme-cli.spec b/nvme-cli.spec index 52775f9..480e9f9 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -1,3 +1,6 @@ +# RHEL 8 compatibility +%{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}} + Name: nvme-cli Version: 2.2 Release: 1%{?dist} @@ -15,12 +18,15 @@ BuildRequires: zlib-devel BuildRequires: openssl-devel BuildRequires: libnvme-devel >= 1.2 -BuildRequires: json-c-devel >= 0.14 +BuildRequires: json-c-devel >= 0.13 + +%if (0%{?rhel} == 0) BuildRequires: python3-nose2 BuildRequires: python3-mypy BuildRequires: python3-flake8 BuildRequires: python3-autopep8 BuildRequires: python3-isort +%endif BuildRequires: asciidoc BuildRequires: xmlto From f4db33fb554dd405e48b55b56d1b7e5e7b37037a Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 4 Nov 2022 17:31:58 +0100 Subject: [PATCH 6/7] * Fri Nov 04 2022 Tomas Bzatek - 2.2.1-1 - Update to 2.2.1 --- .gitignore | 1 + nvme-cli.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9398b26..702e65f 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /nvme-cli-2.1.1.tar.gz /nvme-cli-2.1.2.tar.gz /nvme-cli-2.2.tar.gz +/nvme-cli-2.2.1.tar.gz diff --git a/nvme-cli.spec b/nvme-cli.spec index 480e9f9..3a1e508 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -2,7 +2,7 @@ %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}} Name: nvme-cli -Version: 2.2 +Version: 2.2.1 Release: 1%{?dist} Summary: NVMe management command line interface @@ -11,7 +11,6 @@ URL: https://github.com/linux-nvme/nvme-cli Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz BuildRequires: meson >= 0.48.0 -BuildRequires: libuuid-devel BuildRequires: gcc gcc-c++ BuildRequires: systemd-devel BuildRequires: zlib-devel @@ -83,6 +82,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme %changelog +* Fri Nov 04 2022 Tomas Bzatek - 2.2.1-1 +- Update to 2.2.1 + * Tue Nov 01 2022 Tomas Bzatek - 2.2-1 - Update to 2.2 diff --git a/sources b/sources index a062355..4ca9056 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nvme-cli-2.2.tar.gz) = a3f572bb1bbd4ba56eb3a4c1e1aa95c4ed5e7bc1d5adb80125fe54a894c470838cad5457a0420692deb39f4302cefc4fc1eab92c08c134faabe03a654b9542f4 +SHA512 (nvme-cli-2.2.1.tar.gz) = 8efa94d49a4d443cdb0310386733e88117f17719b05044f11e63e2a09143fce55918171b457a467371263ebb2e36552558aad249ae4dbd27941af79fe9722e26 From 8913276269d20edcddaea27884214094d87eb8ef Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 19 May 2023 15:36:10 +0200 Subject: [PATCH 7/7] * Fri May 19 2023 Tomas Bzatek - 2.2.1-2 - Rebuild with clang There's something wrong with gcc on Fedora 37, causing weird miscompilation in commandline option parsing. Rebuilding the same code on Fedora 38 makes it work just fine. Same thing with clang, once recompiled on Fedora 37, the issue is gone. --- nvme-cli.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nvme-cli.spec b/nvme-cli.spec index 3a1e508..bf76b28 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -1,9 +1,11 @@ # RHEL 8 compatibility %{!?version_no_tilde: %define version_no_tilde %{shrink:%(echo '%{version}' | tr '~' '-')}} +%global toolchain clang + Name: nvme-cli Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVMe management command line interface License: GPLv2 @@ -11,7 +13,7 @@ URL: https://github.com/linux-nvme/nvme-cli Source0: %{url}/archive/v%{version_no_tilde}/%{name}-%{version_no_tilde}.tar.gz BuildRequires: meson >= 0.48.0 -BuildRequires: gcc gcc-c++ +BuildRequires: clang BuildRequires: systemd-devel BuildRequires: zlib-devel BuildRequires: openssl-devel @@ -82,6 +84,9 @@ rm -rf %{buildroot}%{_pkgdocdir}/nvme %changelog +* Fri May 19 2023 Tomas Bzatek - 2.2.1-2 +- Rebuild with clang + * Fri Nov 04 2022 Tomas Bzatek - 2.2.1-1 - Update to 2.2.1