| |
@@ -1,12 +1,17 @@
|
| |
Name: ndctl
|
| |
Version: 71.1
|
| |
- Release: 4%{?dist}
|
| |
+ Release: 4.1%{?dist}
|
| |
Summary: Manage "libnvdimm" subsystem devices (Non-volatile Memory)
|
| |
License: GPLv2
|
| |
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
|
| |
|
| |
+ %if 0%{?facebook}
|
| |
+ # https://github.com/elake/ndctl diff from 71.1 (ea014c0) to main (3ff031d)
|
| |
+ # This was generated with `git diff` because `git format-patch` doesn't handle the merges well
|
| |
+ Patch0: elake-diff-ea014c0-3ff031d.patch
|
| |
+ %else
|
| |
Patch0: modprobe-link-user-keyring-before-loadkeys.patch
|
| |
Patch1: fb13dfb-zero_info_block-skip-seed-devices.patch
|
| |
Patch2: daef3a3-libndctl-Unify-adding-dimms-for-papr-and-nfit-families.patch
|
| |
@@ -22,9 +27,13 @@
|
| |
Patch12: edcd9b7-libndctl-intel-Indicate-supported-smart-inject-types.patch
|
| |
Patch13: 9ef460e-libndctl-papr-Add-limited-support-for-inject-smart.patch
|
| |
Patch14: 6e85cac-ndtest-ack-shutdown-count-Skip-the-test-on-ndtest.patch
|
| |
+ %endif
|
| |
|
| |
Requires: ndctl-libs%{?_isa} = %{version}-%{release}
|
| |
Requires: daxctl-libs%{?_isa} = %{version}-%{release}
|
| |
+ %if 0%{?facebook}
|
| |
+ Requires: cxl-libs%{?_isa} = %{version}-%{release}
|
| |
+ %endif
|
| |
BuildRequires: autoconf
|
| |
BuildRequires: asciidoc
|
| |
BuildRequires: xmlto
|
| |
@@ -36,7 +45,7 @@
|
| |
BuildRequires: pkgconfig(uuid)
|
| |
BuildRequires: pkgconfig(json-c)
|
| |
BuildRequires: pkgconfig(bash-completion)
|
| |
- BuildRequires: systemd
|
| |
+ BuildRequires: pkgconfig(systemd)
|
| |
BuildRequires: keyutils-libs-devel
|
| |
|
| |
%description
|
| |
@@ -68,6 +77,26 @@
|
| |
of performance / feature differentiated memory without need of a
|
| |
filesystem.
|
| |
|
| |
+ %if 0%{?facebook}
|
| |
+ %package -n cxl-cli
|
| |
+ Summary: Manage CXL devices
|
| |
+ License: GPLv2
|
| |
+ Requires: cxl-libs%{?_isa} = %{version}-%{release}
|
| |
+
|
| |
+ %description -n cxl-cli
|
| |
+ The cxl utility provides enumeration and provisioning commands for
|
| |
+ the Linux kernel CXL devices.
|
| |
+
|
| |
+ %package -n cxl-devel
|
| |
+ Summary: Development files for libcxl
|
| |
+ License: LGPLv2
|
| |
+ Requires: cxl-libs%{?_isa} = %{version}-%{release}
|
| |
+
|
| |
+ %description -n cxl-devel
|
| |
+ This package contains libraries and header files for developing applications
|
| |
+ that use libcxl, a library for enumerating and communicating with CXL devices.
|
| |
+ %endif
|
| |
+
|
| |
%package -n daxctl-devel
|
| |
Summary: Development files for libdaxctl
|
| |
License: LGPLv2
|
| |
@@ -101,6 +130,15 @@
|
| |
feature-differentiated memory. daxctl-libs provides an enumeration /
|
| |
control API for these devices.
|
| |
|
| |
+ %if 0%{?facebook}
|
| |
+ %package -n cxl-libs
|
| |
+ Summary: Management library for CXL devices
|
| |
+ License: LGPLv2
|
| |
+
|
| |
+ %description -n cxl-libs
|
| |
+ libcxl is a library for enumerating and communicating with CXL devices.
|
| |
+ %endif
|
| |
+
|
| |
|
| |
%prep
|
| |
%autosetup -p1 ndctl-%{version}
|
| |
@@ -118,13 +156,13 @@
|
| |
%check
|
| |
make check
|
| |
|
| |
- %post -n ndctl-libs -p /sbin/ldconfig
|
| |
+ %ldconfig_scriptlets -n ndctl-libs
|
| |
|
| |
- %postun -n ndctl-libs -p /sbin/ldconfig
|
| |
+ %ldconfig_scriptlets -n daxctl-libs
|
| |
|
| |
- %post -n daxctl-libs -p /sbin/ldconfig
|
| |
-
|
| |
- %postun -n daxctl-libs -p /sbin/ldconfig
|
| |
+ %if 0%{?facebook}
|
| |
+ %ldconfig_scriptlets -n cxl-libs
|
| |
+ %endif
|
| |
|
| |
%define bashcompdir %(pkg-config --variable=completionsdir bash-completion)
|
| |
|
| |
@@ -145,6 +183,13 @@
|
| |
%{_mandir}/man1/daxctl*
|
| |
%{_datadir}/daxctl/daxctl.conf
|
| |
|
| |
+ %if 0%{?facebook}
|
| |
+ %files -n cxl-cli
|
| |
+ %license LICENSES/preferred/GPL-2.0 LICENSES/other/MIT LICENSES/other/CC0-1.0
|
| |
+ %{_bindir}/cxl
|
| |
+ %{_mandir}/man1/cxl*
|
| |
+ %endif
|
| |
+
|
| |
%files -n ndctl-libs
|
| |
%doc README.md
|
| |
%license LICENSES/preferred/LGPL-2.1 LICENSES/other/MIT LICENSES/other/CC0-1.0
|
| |
@@ -155,6 +200,13 @@
|
| |
%license LICENSES/preferred/LGPL-2.1 LICENSES/other/MIT LICENSES/other/CC0-1.0
|
| |
%{_libdir}/libdaxctl.so.*
|
| |
|
| |
+ %if 0%{?facebook}
|
| |
+ %files -n cxl-libs
|
| |
+ %doc README.md
|
| |
+ %license LICENSES/preferred/LGPL-2.1 LICENSES/other/MIT LICENSES/other/CC0-1.0
|
| |
+ %{_libdir}/libcxl.so.*
|
| |
+ %endif
|
| |
+
|
| |
%files -n ndctl-devel
|
| |
%license LICENSES/preferred/LGPL-2.1
|
| |
%{_includedir}/ndctl/
|
| |
@@ -167,8 +219,22 @@
|
| |
%{_libdir}/libdaxctl.so
|
| |
%{_libdir}/pkgconfig/libdaxctl.pc
|
| |
|
| |
+ %if 0%{?facebook}
|
| |
+ %files -n cxl-devel
|
| |
+ %license LICENSES/preferred/LGPL-2.1
|
| |
+ %{_includedir}/cxl/
|
| |
+ %{_libdir}/libcxl.so
|
| |
+ %{_libdir}/pkgconfig/libcxl.pc
|
| |
+ %{_mandir}/man3/cxl*
|
| |
+ %{_mandir}/man3/libcxl.3.gz
|
| |
+ %endif
|
| |
+
|
| |
|
| |
%changelog
|
| |
+ * Fri Feb 3 2023 Anita Zhang <the.anitazha@gmail.com> - 71.1-4.1
|
| |
+ - Patch 71.1 with diff between ea014c0..3ff031d from elake/ndctl fork for hs+fb
|
| |
+ - Sync changes from rhel/ndctl.spec (autogenerated by the GitHub Makefile)
|
| |
+
|
| |
* Tue Jun 14 2022 Jeff Moyer <jmoyer@redhat.com> - 71.1-4.el8
|
| |
- Pull in fixes from upstream v72 and v73 (Jeff Moyer)
|
| |
- Fix enable-namespace all reporting errors incorrectly
|
| |
anitazha
commented 2 years ago
The elake patch file was created with
git diffrather thangit format-patchbecause format-patch doesn't handle the merges from the repo well.