diff --git a/0002-exclude-cxl_monitor_service.patch b/0001-exclude-cxl_monitor_service.patch similarity index 100% rename from 0002-exclude-cxl_monitor_service.patch rename to 0001-exclude-cxl_monitor_service.patch diff --git a/0001-zero_info_block-skip-seed-devices.patch b/0001-zero_info_block-skip-seed-devices.patch deleted file mode 100644 index ca07457d68f137e2c06d41407af56f7a52baa359..0000000000000000000000000000000000000000 --- a/0001-zero_info_block-skip-seed-devices.patch +++ /dev/null @@ -1,49 +0,0 @@ -From fb13dfb8d84c4f0a749665c8f07179450b199f3e Mon Sep 17 00:00:00 2001 -From: Jeff Moyer -Date: Tue, 9 Feb 2021 16:51:53 -0500 -Subject: [PATCH] zero_info_block: skip seed devices - -Currently, ndctl destroy-namespace -f all will output errors of the -form: - - Error: destroy namespace: namespace0.0 failed to enable for zeroing, continuing - -for any zero-sized namespace. That particular namespace looks like this: - - { - "dev":"namespace0.0", - "mode":"raw", - "size":0, - "uuid":"00000000-0000-0000-0000-000000000000", - "sector_size":512, - "state":"disabled" - } - -This patch skips over namespaces with size=0 when zeroing out info -blocks. - -Fixes: 46654c2d60b70 ("ndctl/namespace: Always zero info-blocks") -Reported-by: Zhang Yi -Signed-off-by: Jeff Moyer -Signed-off-by: Vishal Verma -Link: https://lore.kernel.org/r/x49r1lohpty.fsf@segfault.boston.devel.redhat.com ---- - ndctl/namespace.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/ndctl/namespace.c b/ndctl/namespace.c -index 1feb74d..1e8a2cd 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) { --- -2.37.0.windows.1 \ No newline at end of file diff --git a/ndctl-78.tar.gz b/ndctl-78.tar.gz deleted file mode 100644 index 732bd9d096ce347cacaa4edc02253f5f6a59a067..0000000000000000000000000000000000000000 Binary files a/ndctl-78.tar.gz and /dev/null differ diff --git a/ndctl-80.tar.gz b/ndctl-80.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..54ffe8922e7da7458cb129781083599431536832 Binary files /dev/null and b/ndctl-80.tar.gz differ diff --git a/ndctl.spec b/ndctl.spec index afbb465b0f3f8848b17ca59f76bd5abf45fb725d..9d5e70b24043bc9d8f93349f6d21e309054c6edd 100644 --- a/ndctl.spec +++ b/ndctl.spec @@ -1,14 +1,13 @@ Name: ndctl -Version: 78 -Release: 2 +Version: 80 +Release: 1 Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory) -License: GPL-2 AND LGPL-2.1 AND MIT AND CC0-1.0 +License: GPL-2.0-only AND LGPL-2.1-only AND CC0-1.0 AND MIT 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 -Patch1: 0001-zero_info_block-skip-seed-devices.patch -Patch2: 0002-exclude-cxl_monitor_service.patch +Patch1: 0001-exclude-cxl_monitor_service.patch Requires: ndctl-libs%{?_isa} = %{version}-%{release} Requires: daxctl-libs%{?_isa} = %{version}-%{release} @@ -16,8 +15,9 @@ Requires: cxl-libs%{?_isa} = %{version}-%{release} BuildRequires: autoconf BuildRequires: rubygem-asciidoctor BuildRequires: libtraceevent-devel +BuildRequires: libtracefs-devel %define asciidoctor -Dasciidoctor=enabled -%define libtracefs -Dlibtracefs=disabled +%define libtracefs -Dlibtracefs=enabled BuildRequires: xmlto BuildRequires: automake BuildRequires: libtool @@ -44,7 +44,7 @@ Firmware Interface Table). %package -n ndctl-devel Summary: Development files for libndctl -License: LGPLv2 +License: LGPL-2.1-only Group: Development/Libraries Requires: ndctl-libs%{?_isa} = %{version}-%{release} @@ -54,7 +54,7 @@ developing applications that use %{name}. %package -n daxctl Summary: Manage Device-DAX instances -License: GPLv2 +License: GPL-2.0-only Group: System Environment/Base Requires: daxctl-libs%{?_isa} = %{version}-%{release} @@ -66,7 +66,7 @@ filesystem. %package -n cxl-cli Summary: Manage CXL devices -License: GPLv2 +License: GPL-2.0-only Group: System Environment/Base Requires: cxl-libs%{?_isa} = %{version}-%{release} @@ -76,7 +76,7 @@ the Linux kernel CXL devices. %package -n cxl-devel Summary: Development files for libcxl -License: LGPLv2 +License: LGPL-2.1-only Group: Development/Libraries Requires: cxl-libs%{?_isa} = %{version}-%{release} @@ -86,7 +86,7 @@ that use libcxl, a library for enumerating and communicating with CXL devices. %package -n daxctl-devel Summary: Development files for libdaxctl -License: LGPLv2 +License: LGPL-2.1-only Group: Development/Libraries Requires: daxctl-libs%{?_isa} = %{version}-%{release} @@ -99,7 +99,7 @@ mappings of performance / feature-differentiated memory. %package -n ndctl-libs Summary: Management library for "libnvdimm" subsystem devices (Non-volatile Memory) -License: LGPLv2 +License: LGPL-2.1-only AND CC0-1.0 AND MIT Group: System Environment/Libraries Requires: daxctl-libs%{?_isa} = %{version}-%{release} @@ -109,7 +109,7 @@ Libraries for %{name}. %package -n daxctl-libs Summary: Management library for "Device DAX" devices -License: LGPLv2 +License: LGPL-2.1-only AND CC0-1.0 AND MIT Group: System Environment/Libraries %description -n daxctl-libs @@ -119,7 +119,7 @@ control API for these devices. %package -n cxl-libs Summary: Management library for CXL devices -License: LGPLv2 +License: LGPL-2.1-only AND CC0-1.0 AND MIT Group: System Environment/Libraries %description -n cxl-libs @@ -244,6 +244,9 @@ fi %{_mandir}/man3/libcxl.3* %changelog +* Fri Dec 20 2024 lvyy - 80-1 +- upgrade to version 80 + * Mon Apr 8 2024 wuyifeng - 78-2 - fix ndctl delete monitor.service diff --git a/ndctl.yaml b/ndctl.yaml index 095ebbb8ddc1cbaac968a77d683d1e0ed96d9698..10a9b8a9dcea2dd5d94bc2d781b1afe6d66da086 100644 --- a/ndctl.yaml +++ b/ndctl.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: pmem/ndctl tag_prefix: ^v -seperator: . +separator: .