From 53285826cdbd8ef6cf38c04ba378b07daafae465 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 30 Mar 2021 14:12:15 -0400 Subject: [PATCH] import ndctl-71.1-2.el8 --- .gitignore | 2 +- .ndctl.metadata | 2 +- ...skip-seed-devices-in-zero_info_block.patch | 14 +++++++++++ SPECS/ndctl.spec | 24 +++++++++++++------ 4 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 SOURCES/ndctl-skip-seed-devices-in-zero_info_block.patch diff --git a/.gitignore b/.gitignore index 4e90943..80588c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/ndctl-67.tar.gz +SOURCES/ndctl-71.1.tar.gz diff --git a/.ndctl.metadata b/.ndctl.metadata index 3ca7aea..e5b0136 100644 --- a/.ndctl.metadata +++ b/.ndctl.metadata @@ -1 +1 @@ -6bea3b5d545201ab31c3d90b90204cc90dfa88bd SOURCES/ndctl-67.tar.gz +f8266aca55afba19aad91626a6da60e88dba0577 SOURCES/ndctl-71.1.tar.gz diff --git a/SOURCES/ndctl-skip-seed-devices-in-zero_info_block.patch b/SOURCES/ndctl-skip-seed-devices-in-zero_info_block.patch new file mode 100644 index 0000000..d349a7f --- /dev/null +++ b/SOURCES/ndctl-skip-seed-devices-in-zero_info_block.patch @@ -0,0 +1,14 @@ +diff --git a/ndctl/namespace.c b/ndctl/namespace.c +index 0c8df9f..de1e08f 100644 +--- a/ndctl/namespace.c ++++ b/ndctl/namespace.c +@@ -1052,6 +1052,9 @@ static int zero_info_block(struct ndctl_namespace *ndns) + void *buf = NULL, *read_buf = NULL; + char path[50]; + ++ if (ndctl_namespace_get_size(ndns) == 0) ++ return 1; ++ + ndctl_namespace_set_raw_mode(ndns, 1); + rc = ndctl_namespace_enable(ndns); + if (rc < 0) { diff --git a/SPECS/ndctl.spec b/SPECS/ndctl.spec index 8850fa6..995ad27 100644 --- a/SPECS/ndctl.spec +++ b/SPECS/ndctl.spec @@ -1,5 +1,5 @@ Name: ndctl -Version: 67 +Version: 71.1 Release: 2%{?dist} Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory) License: GPLv2 @@ -7,6 +7,7 @@ Group: System Environment/Base Url: https://github.com/pmem/ndctl Source0: https://github.com/pmem/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: modprobe-link-user-keyring-before-loadkeys.patch +Patch1: ndctl-skip-seed-devices-in-zero_info_block.patch Requires: ndctl-libs%{?_isa} = %{version}-%{release} Requires: daxctl-libs%{?_isa} = %{version}-%{release} @@ -90,6 +91,7 @@ control API for these devices. %prep %setup -q ndctl-%{version} %patch0 -p1 +%patch1 -p1 %build echo %{version} > version @@ -115,7 +117,7 @@ make check %define bashcompdir %(pkg-config --variable=completionsdir bash-completion) %files -%license util/COPYING licenses/BSD-MIT licenses/CC0 +%license LICENSES/preferred/GPL-2.0 LICENSES/other/MIT LICENSES/other/CC0-1.0 %{_bindir}/ndctl %{_mandir}/man1/ndctl* %{bashcompdir}/ @@ -126,35 +128,43 @@ make check %config(noreplace) %{_sysconfdir}/ndctl/monitor.conf %files -n daxctl -%license util/COPYING licenses/BSD-MIT licenses/CC0 +%license LICENSES/preferred/GPL-2.0 LICENSES/other/MIT LICENSES/other/CC0-1.0 %{_bindir}/daxctl %{_mandir}/man1/daxctl* %{_datadir}/daxctl/daxctl.conf %files -n ndctl-libs %doc README.md -%license COPYING licenses/BSD-MIT licenses/CC0 +%license LICENSES/preferred/LGPL-2.1 LICENSES/other/MIT LICENSES/other/CC0-1.0 %{_libdir}/libndctl.so.* %files -n daxctl-libs %doc README.md -%license COPYING licenses/BSD-MIT licenses/CC0 +%license LICENSES/preferred/LGPL-2.1 LICENSES/other/MIT LICENSES/other/CC0-1.0 %{_libdir}/libdaxctl.so.* %files -n ndctl-devel -%license COPYING +%license LICENSES/preferred/LGPL-2.1 %{_includedir}/ndctl/ %{_libdir}/libndctl.so %{_libdir}/pkgconfig/libndctl.pc %files -n daxctl-devel -%license COPYING +%license LICENSES/preferred/LGPL-2.1 %{_includedir}/daxctl/ %{_libdir}/libdaxctl.so %{_libdir}/pkgconfig/libdaxctl.pc %changelog +* Thu Feb 11 2021 Jeff Moyer - 71.1-2.el8 +- Get rid of confusing message when deleting all namespaces +- Related: bz#1782182 + +* Fri Feb 5 2021 Jeff Moyer - 71.1-1.el8 +- Update to v71.1 to pull in ppc support. +- Related: bz#1782182 + * Fri Nov 1 2019 Jeff Moyer - 67-2.el8 - Fix up botched change to nvdimm-security.conf (Jeff Moyer) - Related: bz#1724531