.gitignore

@@ -1 +1 @@
-SOURCES/pmdk-1.9.2.tar.gz
+SOURCES/pmdk-1.6.1.tar.gz

.pmdk.metadata

@@ -1 +1 @@
-64f483b1869e76d008c744384e85dad34789fb27 SOURCES/pmdk-1.9.2.tar.gz
+c09c4ee03c00339483d27b578b52ab02f5b246b8 SOURCES/pmdk-1.6.1.tar.gz

SOURCES/pmdk-use-platform-python.patch

@@ -1,21 +1,39 @@
-diff -up pmdk-1.9.2/src/Makefile.orig pmdk-1.9.2/src/Makefile
+diff -up pmdk-1.6/src/Makefile.orig pmdk-1.6/src/Makefile
---- pmdk-1.9.2/src/Makefile.orig	2021-01-06 16:53:52.717410291 -0500
+--- pmdk-1.6/src/Makefile.orig	2019-05-28 16:11:31.757452522 -0400
-+++ pmdk-1.9.2/src/Makefile	2021-01-06 16:53:52.718410294 -0500
++++ pmdk-1.6/src/Makefile	2019-05-28 16:12:14.011574229 -0400
-@@ -186,7 +186,7 @@ install: all pkg-config
+@@ -204,7 +204,7 @@ install: all pkg-config
  	install -d $(PMREORDER_DESTDIR)
  	install -p -m 0644 $(PMREORDER_FILES) $(PMREORDER_DESTDIR)
  	@echo "#!/bin/sh" > $(PMREORDER_SRC)/pmreorder
--	@echo "exec python3 $(PMREORDER_ROOTDIR)/pmreorder.py $(SRCVERSION) \$$*" >> $(PMREORDER_SRC)/pmreorder
+-	@echo "exec python3 $(PMREORDER_ROOTDIR)/pmreorder.py \$$*" >> $(PMREORDER_SRC)/pmreorder
-+	@echo "exec /usr/libexec/platform-python $(PMREORDER_ROOTDIR)/pmreorder.py $(SRCVERSION) \$$*" >> $(PMREORDER_SRC)/pmreorder
++	@echo "exec /usr/libexec/platform-python $(PMREORDER_ROOTDIR)/pmreorder.py \$$*" >> $(PMREORDER_SRC)/pmreorder
  	install -d $(PMREORDER_BIN)
  	install -p $(PMREORDER_SRC)/pmreorder $(PMREORDER_BIN)
  	$(RM) $(PKG_CONFIG_FILES)
-diff -up pmdk-1.9.2/src/test/RUNTESTS.py.orig pmdk-1.9.2/src/test/RUNTESTS.py
+diff -up pmdk-1.6/src/test/RUNTESTS.py.orig pmdk-1.6/src/test/RUNTESTS.py
---- pmdk-1.9.2/src/test/RUNTESTS.py.orig	2021-01-06 16:54:37.937567105 -0500
+--- pmdk-1.6/src/test/RUNTESTS.py.orig	2019-05-28 16:12:39.334647173 -0400
-+++ pmdk-1.9.2/src/test/RUNTESTS.py	2021-01-06 16:54:37.938567109 -0500
++++ pmdk-1.6/src/test/RUNTESTS.py	2019-05-28 16:12:39.335647176 -0400
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/libexec/platform-python
- # SPDX-License-Identifier: BSD-3-Clause
+ #
- # Copyright 2019-2020, Intel Corporation
+ # Copyright 2019, Intel Corporation
- 
+ #
+diff -up pmdk-1.6/src/test/env.py.orig pmdk-1.6/src/test/env.py
+--- pmdk-1.6/src/test/env.py.orig	2019-05-28 16:13:22.026770140 -0400
++++ pmdk-1.6/src/test/env.py	2019-05-28 16:13:22.027770143 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/libexec/platform-python
+ #
+ # Copyright 2019, Intel Corporation
+ #
+diff -up pmdk-1.6/src/tools/pmreorder/pmreorder.py.orig pmdk-1.6/src/tools/pmreorder/pmreorder.py
+--- pmdk-1.6/src/tools/pmreorder/pmreorder.py.orig	2019-05-28 16:11:31.757452522 -0400
++++ pmdk-1.6/src/tools/pmreorder/pmreorder.py	2019-05-28 16:12:14.012574231 -0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/libexec/platform-python
+ #
+ # Copyright 2018, Intel Corporation
+ #

SPECS/pmdk.spec

@@ -17,7 +17,7 @@
 %define min_ndctl_ver 60.1
 
 Name:		pmdk
-Version:	1.9.2
+Version:	1.6.1
 Release:	1%{?dist}
 Summary:	Persistent Memory Development Kit (former NVML)
 License:	BSD
@@ -33,8 +33,6 @@ BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	man
 BuildRequires:	pkgconfig
-BuildRequires:	pandoc
-BuildRequires:	groff
 
 %if %{with ndctl}
 BuildRequires:	ndctl-devel >= %{min_ndctl_ver}
@@ -50,12 +48,8 @@ BuildRequires:	libfabric-devel >= %{min_libfabric_ver}
 %global __provides_exclude_from ^%{_libdir}/pmdk_debug/.*\\.so.*$
 
 # By design, PMDK does not support any 32-bit architecture.
-# Due to dependency on some inline assembly, PMDK can be compiled only
+# Due to dependency on xmmintrin.h and some inline assembly, it can be
-# on these architectures:
+# compiled only for x86_64 at the moment.
-# - x86_64
-# - ppc64le (experimental)
-# - aarch64 (unmaintained, supporting hardware doesn't exist?)
-#
 # Other 64-bit architectures could also be supported, if only there is
 # a request for that, and if somebody provides the arch-specific
 # implementation of the low-level routines for flushing to persistent
@@ -63,9 +57,10 @@ BuildRequires:	libfabric-devel >= %{min_libfabric_ver}
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1340634
 # https://bugzilla.redhat.com/show_bug.cgi?id=1340635
+# https://bugzilla.redhat.com/show_bug.cgi?id=1340636
 # https://bugzilla.redhat.com/show_bug.cgi?id=1340637
 
-ExclusiveArch: x86_64 ppc64le
+ExclusiveArch: x86_64
 
 %description
 The Persistent Memory Development Kit is a collection of libraries for
@@ -340,6 +335,133 @@ debug version is to set the environment variable LD_LIBRARY_PATH to
 %doc ChangeLog CONTRIBUTING.md README.md
 
 
+%package -n libvmem
+Summary: Volatile Memory allocation library
+Group: System Environment/Libraries
+%description -n libvmem
+The libvmem library turns a pool of persistent memory into a volatile
+memory pool, similar to the system heap but kept separate and with
+its own malloc-style API.
+
+%files -n libvmem
+%defattr(-,root,root,-)
+%{_libdir}/libvmem.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmem-devel
+Summary: Development files for the Volatile Memory allocation library
+Group: Development/Libraries
+Requires: libvmem = %{version}-%{release}
+%description -n libvmem-devel
+The libvmem library turns a pool of persistent memory into a volatile
+memory pool, similar to the system heap but kept separate and with
+its own malloc-style API.
+
+This sub-package contains libraries and header files for developing
+applications that want to make use of libvmem.
+
+%files -n libvmem-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvmem.so
+%{_libdir}/pkgconfig/libvmem.pc
+%{_includedir}/libvmem.h
+%{_mandir}/man7/libvmem.7.gz
+%{_mandir}/man3/vmem_*.3.gz
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmem-debug
+Summary: Debug variant of the Volatile Memory allocation library
+Group: Development/Libraries
+Requires: libvmem = %{version}-%{release}
+%description -n libvmem-debug
+The libvmem library turns a pool of persistent memory into a volatile
+memory pool, similar to the system heap but kept separate and with
+its own malloc-style API.
+
+This sub-package contains debug variant of the library, providing
+run-time assertions and trace points. The typical way to access the
+debug version is to set the environment variable LD_LIBRARY_PATH to
+/usr/lib64/pmdk_debug.
+
+%files -n libvmem-debug
+%defattr(-,root,root,-)
+%dir %{_libdir}/pmdk_debug
+%{_libdir}/pmdk_debug/libvmem.so
+%{_libdir}/pmdk_debug/libvmem.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmmalloc
+Summary: Dynamic to Persistent Memory allocation translation library
+Group: System Environment/Libraries
+%description -n libvmmalloc
+The libvmmalloc library transparently converts all the dynamic memory
+allocations into persistent memory allocations. This allows the use
+of persistent memory as volatile memory without modifying the target
+application.
+
+The typical usage of libvmmalloc is to load it via the LD_PRELOAD
+environment variable.
+
+%files -n libvmmalloc
+%defattr(-,root,root,-)
+%{_libdir}/libvmmalloc.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmmalloc-devel
+Summary: Development files for the Dynamic-to-Persistent allocation library
+Group: Development/Libraries
+Requires: libvmmalloc = %{version}-%{release}
+%description -n libvmmalloc-devel
+The libvmmalloc library transparently converts all the dynamic memory
+allocations into persistent memory allocations. This allows the use
+of persistent memory as volatile memory without modifying the target
+application.
+
+This sub-package contains libraries and header files for developing
+applications that want to specifically make use of libvmmalloc.
+
+%files -n libvmmalloc-devel
+%defattr(-,root,root,-)
+%{_libdir}/libvmmalloc.so
+%{_libdir}/pkgconfig/libvmmalloc.pc
+%{_includedir}/libvmmalloc.h
+%{_mandir}/man7/libvmmalloc.7.gz
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
+%package -n libvmmalloc-debug
+Summary: Debug variant of the Dynamic-to-Persistent allocation library
+Group: Development/Libraries
+Requires: libvmmalloc = %{version}-%{release}
+%description -n libvmmalloc-debug
+The libvmmalloc library transparently converts all the dynamic memory
+allocations into persistent memory allocations. This allows the use
+of persistent memory as volatile memory without modifying the target
+application.
+
+This sub-package contains debug variant of the library, providing
+run-time assertions and trace points. The typical way to access the
+debug version is to set the environment variable LD_LIBRARY_PATH to
+/usr/lib64/pmdk_debug.
+
+%files -n libvmmalloc-debug
+%defattr(-,root,root,-)
+%dir %{_libdir}/pmdk_debug
+%{_libdir}/pmdk_debug/libvmmalloc.so
+%{_libdir}/pmdk_debug/libvmmalloc.so.*
+%license LICENSE
+%doc ChangeLog CONTRIBUTING.md README.md
+
+
 %package -n libpmempool
 Summary: Persistent Memory pool management library
 Group: System Environment/Libraries
@@ -347,7 +469,7 @@ Requires: libpmem = %{version}-%{release}
 %description -n libpmempool
 The libpmempool library provides a set of utilities for off-line
 administration, analysis, diagnostics and repair of persistent memory
-pools created by libpmemlog, libpmemblk and libpmemobj libraries.
+pools created by libpmemlog, libpemblk and libpmemobj libraries.
 
 %files -n libpmempool
 %defattr(-,root,root,-)
@@ -364,7 +486,7 @@ Requires: libpmem-devel = %{version}-%{release}
 %description -n libpmempool-devel
 The libpmempool library provides a set of utilities for off-line
 administration, analysis, diagnostics and repair of persistent memory
-pools created by libpmemlog, libpmemblk and libpmemobj libraries.
+pools created by libpmemlog, libpemblk and libpmemobj libraries.
 
 %files -n libpmempool-devel
 %defattr(-,root,root,-)
@@ -386,7 +508,7 @@ Requires: libpmem = %{version}-%{release}
 %description -n libpmempool-debug
 The libpmempool library provides a set of utilities for off-line
 administration, analysis, diagnostics and repair of persistent memory
-pools created by libpmemlog, libpmemblk and libpmemobj libraries.
+pools created by libpmemlog, libpemblk and libpmemobj libraries.
 
 This sub-package contains debug variant of the library, providing
 run-time assertions and trace points. The typical way to access the
@@ -480,8 +602,7 @@ and facilitates access to persistent memory over RDMA.
 %{_bindir}/rpmemd
 %{_mandir}/man1/rpmemd.1.gz
 
-# _with_fabric
+%endif # _with_fabric
-%endif
 
 %package -n pmempool
 Summary: Utilities for Persistent Memory
@@ -547,8 +668,7 @@ a device.
 %license LICENSE
 %doc ChangeLog CONTRIBUTING.md README.md
 
-# _with_ndctl
+%endif # _with_ndctl
-%endif
 
 
 %prep
@@ -584,6 +704,10 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
 %postun -n libpmemlog -p /sbin/ldconfig
 %post   -n libpmemobj -p /sbin/ldconfig
 %postun -n libpmemobj -p /sbin/ldconfig
+%post   -n libvmem -p /sbin/ldconfig
+%postun -n libvmem -p /sbin/ldconfig
+%post   -n libvmmalloc -p /sbin/ldconfig
+%postun -n libvmmalloc -p /sbin/ldconfig
 %post   -n libpmempool -p /sbin/ldconfig
 %postun -n libpmempool -p /sbin/ldconfig
 
@@ -598,12 +722,6 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
 
 
 %changelog
-* Wed Jan  6 2021 Jeff Moyer <jmoyer@redhat.com> - 1.9.2-1.el8
-- Package pmdk version 1.9.2 for stream 1-fileformat-v6-rhel-8.3.1
-- libvmem is no longer packaged as part of pmdk.
-- ppc64le packages are now built
-- Related: rhbz#1524652, rhbz#1780388, rhbz#1854812, rhbz#1860860
-
 * Fri Nov  1 2019 Jeff Moyer <jmoyer@redhat.com> - 1.6.1-1.el8
 - Update to pmdk bugfix relase 1.6.1.
 - Resolves: rhbz#1730675