From baa95c11a579c8cf7cbef1b8e68b0a261c705f4c Mon Sep 17 00:00:00 2001 From: anolis-bot Date: Tue, 16 May 2023 22:15:29 +0800 Subject: [PATCH 1/2] update to nvme-cli-1.16-7.el8 Signed-off-by: anolis-bot --- 0016-fix-file-permissions-nvme-print.c.patch | 19 +++++++++++ nvme-cli.spec | 35 ++++++++------------ 2 files changed, 32 insertions(+), 22 deletions(-) create mode 100644 0016-fix-file-permissions-nvme-print.c.patch diff --git a/0016-fix-file-permissions-nvme-print.c.patch b/0016-fix-file-permissions-nvme-print.c.patch new file mode 100644 index 0000000..0f4ef9d --- /dev/null +++ b/0016-fix-file-permissions-nvme-print.c.patch @@ -0,0 +1,19 @@ +From f9b6c2100db88e9f317f15f17faaed59b725ac9b Mon Sep 17 00:00:00 2001 +From: Keith Busch +Date: Tue, 24 Aug 2021 11:49:16 -0700 +Subject: [PATCH] fix file permissions (nvme-print.c) + +It's not executable. + +Signed-off-by: Keith Busch +--- + nvme-print.c | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + mode change 100755 => 100644 nvme-print.c + +diff --git a/nvme-print.c b/nvme-print.c +old mode 100755 +new mode 100644 +-- +2.31.1 + diff --git a/nvme-cli.spec b/nvme-cli.spec index 9c53abf..0c89a67 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -1,10 +1,9 @@ -%define anolis_release .0.1 #%%global commit0 bdbb4da0979fbdc079cf98410cdb31cf799e83b3 #%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) Name: nvme-cli Version: 1.16 -Release: 5%{anolis_release}%{?dist} +Release: 7%{?dist} Summary: NVMe management command line interface License: GPLv2+ @@ -27,29 +26,16 @@ Patch12: 0012-nvme-cli-Adds-readable-firmware-level-in-persistent.patch Patch13: 0013-nvme-cli-Add-support-set-feature-event-in-PEL.patch Patch14: 0014-nvme-cli-Add-support-Telemetry-CRT-in-PEL.patch Patch15: 0015-fix-firmware-log-page-frs-variable-sign.patch +Patch16: 0016-fix-file-permissions-nvme-print.c.patch BuildRequires: libuuid-devel BuildRequires: gcc BuildRequires: systemd-devel Requires: util-linux -Requires: libgcc -Requires: glibc -Requires: libuuid - -Provides: /usr/sbin/nvme - %description nvme-cli provides NVM-Express user space tooling for Linux. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - -%description doc -Doc pages for %{name}. - %prep #%%setup -qn %%{name}-%%{commit0} %setup -q @@ -69,6 +55,7 @@ Doc pages for %{name}. %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build @@ -93,6 +80,7 @@ rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf %files %license LICENSE +%doc README.md %{_sbindir}/nvme %{_mandir}/man1/nvme*.gz %{_datadir}/bash-completion/completions/nvme @@ -107,9 +95,6 @@ rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf # Do not install the dracut rule yet. See rhbz 1742764 # /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf -%files doc -%doc README.md - %post if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then @@ -120,15 +105,21 @@ if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then fi # apply udev and systemd changes that we did - systemctl enable nvmefc-boot-connections + if [ $1 -eq 1 ]; then + systemctl enable nvmefc-boot-connections + fi systemctl daemon-reload udevadm control --reload-rules && udevadm trigger exit 0 fi %changelog -* Tue Jan 03 2023 Weisson - 1.16-5.0.1 -- Add doc sub package +* Wed Nov 09 2022 Maurizio Lombardi - 1.16-7 +- Do not re-enable the nvmefc-boot-connections service if + we are just upgrading the package. + +* Thu Oct 13 2022 Maurizio Lombardi - 1.16-6 +- Fix a file permission * Fri Jul 15 2022 Maurizio Lombardi - 1.16-5 - Fix a compiler warning -- Gitee From aaf4d37ed5be198266502463579ff29bbe3d4788 Mon Sep 17 00:00:00 2001 From: Weisson Date: Tue, 19 Jul 2022 15:13:57 +0800 Subject: [PATCH 2/2] spec: add doc sub package Signed-off-by: Weisson --- nvme-cli.spec | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/nvme-cli.spec b/nvme-cli.spec index 0c89a67..dcda18b 100644 --- a/nvme-cli.spec +++ b/nvme-cli.spec @@ -1,9 +1,10 @@ +%define anolis_release .0.1 #%%global commit0 bdbb4da0979fbdc079cf98410cdb31cf799e83b3 #%%global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7}) Name: nvme-cli Version: 1.16 -Release: 7%{?dist} +Release: 7%{anolis_release}%{?dist} Summary: NVMe management command line interface License: GPLv2+ @@ -33,9 +34,23 @@ BuildRequires: gcc BuildRequires: systemd-devel Requires: util-linux +Requires: libgcc +Requires: glibc +Requires: libuuid + +Provides: /usr/sbin/nvme + %description nvme-cli provides NVM-Express user space tooling for Linux. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description doc +Doc pages for %{name}. + %prep #%%setup -qn %%{name}-%%{commit0} %setup -q @@ -80,7 +95,6 @@ rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf %files %license LICENSE -%doc README.md %{_sbindir}/nvme %{_mandir}/man1/nvme*.gz %{_datadir}/bash-completion/completions/nvme @@ -95,6 +109,9 @@ rm -f %{buildroot}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf # Do not install the dracut rule yet. See rhbz 1742764 # /usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf +%files doc +%doc README.md + %post if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then if [ ! -s %{_sysconfdir}/nvme/hostnqn ]; then @@ -114,6 +131,9 @@ if [ $1 -eq 1 ] || [ $1 -eq 2 ]; then fi %changelog +* Tue May 30 2023 Weisson - 1.16-7.0.1 +- Add doc sub package + * Wed Nov 09 2022 Maurizio Lombardi - 1.16-7 - Do not re-enable the nvmefc-boot-connections service if we are just upgrading the package. -- Gitee