diff --git a/.gitignore b/.gitignore index aeab119..051b0de 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/nvml-1.2.1.tar.gz +SOURCES/nvml-1.3.tar.gz diff --git a/.nvml.metadata b/.nvml.metadata index e1d202b..26b0e48 100644 --- a/.nvml.metadata +++ b/.nvml.metadata @@ -1 +1 @@ -62f83fb89a694e69bbcec391123b3f99da5eec09 SOURCES/nvml-1.2.1.tar.gz +6a6313ed627a27f5ca04d29c027b4f8a48bcb987 SOURCES/nvml-1.3.tar.gz diff --git a/SOURCES/14a76ef-rpmem_fip-return-failure-for-a-failed-allocation.patch b/SOURCES/14a76ef-rpmem_fip-return-failure-for-a-failed-allocation.patch new file mode 100644 index 0000000..8f34718 --- /dev/null +++ b/SOURCES/14a76ef-rpmem_fip-return-failure-for-a-failed-allocation.patch @@ -0,0 +1,29 @@ +rpmem_fip: return failure for a failed allocation + +BZ: + +commit 14a76ef815d6bd22919b9c9351778ddc42d28212 +Author: Jeff Moyer +Date: Thu Oct 19 17:21:35 2017 -0400 + + rpmem_fip: return failure for a failed allocation + + rpmem_fip_getinfo will return 0 (success) when it fails to + allocate space. This can result in a NULL pointer dereference + later on in callers. + + Signed-off-by: Jeff Moyer + +diff --git a/src/librpmem/rpmem_fip.c b/src/librpmem/rpmem_fip.c +index 87ffcaf..0993213 100644 +--- a/src/librpmem/rpmem_fip.c ++++ b/src/librpmem/rpmem_fip.c +@@ -368,7 +368,7 @@ static int + rpmem_fip_getinfo(struct rpmem_fip *fip, const char *node, const char *service, + enum rpmem_provider provider, enum rpmem_persist_method pm) + { +- int ret = 0; ++ int ret = -1; + struct fi_info *hints = rpmem_fip_get_hints(provider); + if (!hints) { + RPMEM_LOG(ERR, "!getting fabric interface information hints"); diff --git a/SOURCES/670e94e-pmempool-fix-mapping-type-in-pool_params_parse.patch b/SOURCES/670e94e-pmempool-fix-mapping-type-in-pool_params_parse.patch deleted file mode 100644 index f954ad8..0000000 --- a/SOURCES/670e94e-pmempool-fix-mapping-type-in-pool_params_parse.patch +++ /dev/null @@ -1,25 +0,0 @@ -pmempool: fix mapping type in pool_params_parse - -BZ: 1436820 - -commit 670e94e62d8dfdd9a66435dcf415b0a3fffc65c6 -Author: Lukasz Dorau -Date: Wed Dec 14 16:58:03 2016 +0100 - - pmempool: fix mapping type in pool_params_parse - - This change is required on account of DAX devices. - -diff --git a/src/libpmempool/pool.c b/src/libpmempool/pool.c -index 6705bfe..7c4ec1a 100644 ---- a/src/libpmempool/pool.c -+++ b/src/libpmempool/pool.c -@@ -349,7 +349,7 @@ pool_params_parse(const PMEMpoolcheck *ppc, struct pool_params *params, - } - params->size = (size_t)s; - addr = mmap(NULL, (uint64_t)params->size, PROT_READ, -- MAP_PRIVATE, fd, 0); -+ MAP_SHARED, fd, 0); - if (addr == MAP_FAILED) { - ret = -1; - goto out_close; diff --git a/SOURCES/aabd4d2-test-do-not-run-pool_lock-test-as-root.patch b/SOURCES/aabd4d2-test-do-not-run-pool_lock-test-as-root.patch deleted file mode 100644 index 702375f..0000000 --- a/SOURCES/aabd4d2-test-do-not-run-pool_lock-test-as-root.patch +++ /dev/null @@ -1,129 +0,0 @@ -test: do not run pool_lock test as root - -BZ: 1383467 - -commit aabd4d26de7a41400f66632989b3592786d7db89 -Author: Krzysztof Czurylo -Date: Thu Mar 16 13:33:14 2017 +0100 - - test: do not run pool_lock test as root - - Backported from master (4a86707). - -diff --git a/src/test/blk_pool_lock/TEST0 b/src/test/blk_pool_lock/TEST0 -index 2d89772..feac8d2 100755 ---- a/src/test/blk_pool_lock/TEST0 -+++ b/src/test/blk_pool_lock/TEST0 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2015-2016, Intel Corporation -+# Copyright 2015-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -41,6 +41,7 @@ export UNITTEST_NUM=0 - . ../unittest/unittest.sh - - require_test_type medium -+require_no_superuser - - setup - -diff --git a/src/test/blk_pool_lock/TEST0.PS1 b/src/test/blk_pool_lock/TEST0.PS1 -index 8e12e52..a33c083 100644 ---- a/src/test/blk_pool_lock/TEST0.PS1 -+++ b/src/test/blk_pool_lock/TEST0.PS1 -@@ -1,5 +1,5 @@ - # --# Copyright 2015-2016, Intel Corporation -+# Copyright 2015-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -47,6 +47,7 @@ $Env:UNITTEST_NUM = "0" - . ..\unittest\unittest.ps1 - - require_test_type medium -+require_no_superuser - - # doesn't make sense to run in local directory - require_fs_type any -diff --git a/src/test/log_pool_lock/TEST0 b/src/test/log_pool_lock/TEST0 -index 498b04c..b285486 100755 ---- a/src/test/log_pool_lock/TEST0 -+++ b/src/test/log_pool_lock/TEST0 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2015-2016, Intel Corporation -+# Copyright 2015-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -41,6 +41,7 @@ export UNITTEST_NUM=0 - . ../unittest/unittest.sh - - require_test_type medium -+require_no_superuser - - setup - -diff --git a/src/test/log_pool_lock/TEST0.PS1 b/src/test/log_pool_lock/TEST0.PS1 -index 833825c..9c2ba17 100644 ---- a/src/test/log_pool_lock/TEST0.PS1 -+++ b/src/test/log_pool_lock/TEST0.PS1 -@@ -1,5 +1,5 @@ - # --# Copyright 2015-2016, Intel Corporation -+# Copyright 2015-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -47,6 +47,7 @@ $Env:UNITTEST_NUM = "0" - . ..\unittest\unittest.ps1 - - require_test_type medium -+require_no_superuser - - # doesn't make sense to run in local directory - require_fs_type any -diff --git a/src/test/obj_pool_lock/TEST0 b/src/test/obj_pool_lock/TEST0 -index 60f5c55..944475e 100755 ---- a/src/test/obj_pool_lock/TEST0 -+++ b/src/test/obj_pool_lock/TEST0 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2015-2016, Intel Corporation -+# Copyright 2015-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -41,6 +41,7 @@ export UNITTEST_NUM=0 - . ../unittest/unittest.sh - - require_test_type medium -+require_no_superuser - - setup - -diff --git a/src/test/obj_pool_lock/TEST0.PS1 b/src/test/obj_pool_lock/TEST0.PS1 -index 2d15fb5..3f35b28 100644 ---- a/src/test/obj_pool_lock/TEST0.PS1 -+++ b/src/test/obj_pool_lock/TEST0.PS1 -@@ -1,5 +1,5 @@ - # --# Copyright 2015-2016, Intel Corporation -+# Copyright 2015-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -47,6 +47,7 @@ $Env:UNITTEST_NUM = "0" - . ..\unittest\unittest.ps1 - - require_test_type medium -+require_no_superuser - - # doesn't make sense to run in local directory - require_fs_type any diff --git a/SOURCES/cb2e8d2-test-limit-number-of-arenas-in-vmem_stats.patch b/SOURCES/cb2e8d2-test-limit-number-of-arenas-in-vmem_stats.patch deleted file mode 100644 index f59ac4b..0000000 --- a/SOURCES/cb2e8d2-test-limit-number-of-arenas-in-vmem_stats.patch +++ /dev/null @@ -1,244 +0,0 @@ -test: limit number of arenas in vmem_stats - -BZ: 1383467 - -commit cb2e8d2590520463bf43453dab1c38fa6d1e0747 -Author: Krzysztof Czurylo -Date: Fri Mar 17 15:50:53 2017 +0100 - - test: limit number of arenas in vmem_stats - - By default, jemalloc allocates 4 * num_of_cpu arenas. If statistics - are enabled, it also allocates the corresponding per-arena stat - structures for all the arenas, even if only one arena is actually used - (single-threaded program). If this test is run on a machine with - the number of cores >=64, the amount of memory required to keep all - the statistics is larger than the usable space of the pool. - - The easiest workaround is to limit the number of arenas for this test - by setting JE_VMEM_MALLOC_CONF environment variable. Thus, the test can - be run on any machine and we don't need to calculate the pool size - based on number of available CPU cores. - - Backported from master (ccbf4cb). - -diff --git a/src/test/vmem_stats/TEST0 b/src/test/vmem_stats/TEST0 -index 5e11b9a..6f180b6 100755 ---- a/src/test/vmem_stats/TEST0 -+++ b/src/test/vmem_stats/TEST0 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 0 - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST1 b/src/test/vmem_stats/TEST1 -index bfabb87..1deb947 100755 ---- a/src/test/vmem_stats/TEST1 -+++ b/src/test/vmem_stats/TEST1 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 0 g - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST2 b/src/test/vmem_stats/TEST2 -index 776e938..729a315 100755 ---- a/src/test/vmem_stats/TEST2 -+++ b/src/test/vmem_stats/TEST2 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 0 gbl - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST3 b/src/test/vmem_stats/TEST3 -index 3bfb975..99ac9f4 100755 ---- a/src/test/vmem_stats/TEST3 -+++ b/src/test/vmem_stats/TEST3 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 0 gbla - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST4 b/src/test/vmem_stats/TEST4 -index b310590..779fe86 100755 ---- a/src/test/vmem_stats/TEST4 -+++ b/src/test/vmem_stats/TEST4 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 0 gblma - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST5 b/src/test/vmem_stats/TEST5 -index 5524b69..8d39f1a 100755 ---- a/src/test/vmem_stats/TEST5 -+++ b/src/test/vmem_stats/TEST5 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 1 - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST6 b/src/test/vmem_stats/TEST6 -index 6a6b8c7..3fc0a3a 100755 ---- a/src/test/vmem_stats/TEST6 -+++ b/src/test/vmem_stats/TEST6 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 1 g - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST7 b/src/test/vmem_stats/TEST7 -index f9f1545..c7d4d5c 100755 ---- a/src/test/vmem_stats/TEST7 -+++ b/src/test/vmem_stats/TEST7 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 1 gbl - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST8 b/src/test/vmem_stats/TEST8 -index 07c0e08..33509cc 100755 ---- a/src/test/vmem_stats/TEST8 -+++ b/src/test/vmem_stats/TEST8 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 1 gbla - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - -diff --git a/src/test/vmem_stats/TEST9 b/src/test/vmem_stats/TEST9 -index b67f261..085835e 100755 ---- a/src/test/vmem_stats/TEST9 -+++ b/src/test/vmem_stats/TEST9 -@@ -1,6 +1,6 @@ - #!/bin/bash -e - # --# Copyright 2014-2016, Intel Corporation -+# Copyright 2014-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without - # modification, are permitted provided that the following conditions -@@ -50,6 +50,9 @@ configure_valgrind memcheck force-disable - - setup - -+# limit the number of arenas to fit into the minimal VMEM pool size -+export JE_VMEM_MALLOC_CONF="narenas:64" -+ - expect_normal_exit ./vmem_stats$EXESUFFIX 1 gblma - grep -v ':' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log - diff --git a/SOURCES/fbef3ef-rpmemd-fix-potential-memory-leak.patch b/SOURCES/fbef3ef-rpmemd-fix-potential-memory-leak.patch new file mode 100644 index 0000000..3bd7c8f --- /dev/null +++ b/SOURCES/fbef3ef-rpmemd-fix-potential-memory-leak.patch @@ -0,0 +1,35 @@ +rpmemd: fix potential memory leak + +BZ: + +commit fbef3efa8c874ec71cb69455603a03ba9023641f +Author: Jeff Moyer +Date: Thu Oct 19 17:20:12 2017 -0400 + + rpmemd: fix potential memory leak + + If realloc fails, the original buffer is leaked. Fix it. + + Signed-off-by: Jeff Moyer + +diff --git a/src/tools/rpmemd/rpmemd_config.c b/src/tools/rpmemd/rpmemd_config.c +index 17720b6..7cd4505 100644 +--- a/src/tools/rpmemd/rpmemd_config.c ++++ b/src/tools/rpmemd/rpmemd_config.c +@@ -389,12 +389,13 @@ parse_config_file(const char *filename, struct rpmemd_config *config, + goto error; + + if (line_max_increased) { +- line_copy = (char *)realloc(line_copy, ++ char *new = (char *)realloc(line_copy, + sizeof(char) * line_max); +- if (line_copy == NULL) { ++ if (new == NULL) { + RPMEMD_LOG(ERR, "!malloc"); +- goto error_malloc_line_copy; ++ goto error; + } ++ line_copy = new; + line_max_increased = 0; + } + diff --git a/SPECS/nvml.spec b/SPECS/nvml.spec index 5c2c3ff..56b318a 100644 --- a/SPECS/nvml.spec +++ b/SPECS/nvml.spec @@ -1,14 +1,12 @@ - Name: nvml -Version: 1.2.1 -Release: 4%{?dist} +Version: 1.3 +Release: 3%{?dist} Summary: Non-Volatile Memory Library License: BSD URL: http://pmem.io/nvml Source0: https://github.com/pmem/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: aabd4d2-test-do-not-run-pool_lock-test-as-root.patch -Patch1: cb2e8d2-test-limit-number-of-arenas-in-vmem_stats.patch -Patch2: 670e94e-pmempool-fix-mapping-type-in-pool_params_parse.patch +Patch0: fbef3ef-rpmemd-fix-potential-memory-leak.patch +Patch1: 14a76ef-rpmem_fip-return-failure-for-a-failed-allocation.patch BuildRequires: glibc-devel BuildRequires: autoconf @@ -16,12 +14,14 @@ BuildRequires: automake BuildRequires: man BuildRequires: pkgconfig BuildRequires: doxygen +BuildRequires: gdb +%define min_libfabric_ver 1.4.2 +BuildRequires: libfabric-devel >= %{min_libfabric_ver} # Debug variants of the libraries should be filtered out of the provides. %global __provides_exclude_from ^%{_libdir}/nvml_debug/.*\\.so.*$ - # By design, NVML does not support any 32-bit architecture. # Due to dependency on xmmintrin.h and some inline assembly, it can be # compiled only for x86_64 at the moment. @@ -504,6 +504,81 @@ debug version is to set the environment variable LD_LIBRARY_PATH to %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md +%package -n librpmem +Summary: Remote Access to Persistent Memory library +Group: System Environment/Libraries +Requires: libfabric >= %{min_libfabric_ver} +Requires: openssh-clients +%description -n librpmem +The librpmem library provides low-level support for remote access +to persistent memory utilizing RDMA-capable NICs. It can be used +to replicate peristent memory regions over RDMA protocol. + +%files -n librpmem +%defattr(-,root,root,-) +%{_libdir}/librpmem.so.* +%license LICENSE +%doc ChangeLog CONTRIBUTING.md README.md + + +%package -n librpmem-devel +Summary: Development files for the Remote Access to Persistent Memory library +Group: Development/Libraries +Requires: librpmem = %{version}-%{release} +%description -n librpmem-devel +The librpmem library provides low-level support for remote access +to persistent memory utilizing RDMA-capable NICs. It can be used +to replicate peristent memory regions over RDMA protocol. + +This sub-package contains libraries and header files for developing +applications that want to specifically make use of librpmem. + +%files -n librpmem-devel +%defattr(-,root,root,-) +%{_libdir}/librpmem.so +%{_libdir}/pkgconfig/librpmem.pc +%{_includedir}/librpmem.h +%{_mandir}/man3/librpmem.3.gz +%license LICENSE +%doc ChangeLog CONTRIBUTING.md README.md + + +%package -n librpmem-debug +Summary: Debug variant of the Remote Access to Persistent Memory library +Group: Development/Libraries +Requires: librpmem = %{version}-%{release} +%description -n librpmem-debug +The librpmem library provides low-level support for remote access +to persistent memory utilizing RDMA-capable NICs. It can be used +to replicate peristent memory regions over RDMA protocol. + +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/nvml_debug. + +%files -n librpmem-debug +%defattr(-,root,root,-) +%dir %{_libdir}/nvml_debug +%{_libdir}/nvml_debug/librpmem.so +%{_libdir}/nvml_debug/librpmem.so.* +%license LICENSE +%doc ChangeLog CONTRIBUTING.md README.md + + +%package -n rpmemd +Group: System Environment/Base +Summary: Target node process executed by librpmem +Requires: libpmem >= %{version}-%{release} +Requires: libfabric >= %{min_libfabric_ver} +%description -n rpmemd +The rpmemd process is executed on a target node by librpmem library +and facilitates access to persistent memory over RDMA. + +%files -n rpmemd +%{_bindir}/rpmemd +%{_mandir}/man1/rpmemd.1.gz + %package tools Summary: Utilities for Persistent Memory @@ -536,7 +611,6 @@ Useful applications for administration and diagnosis of persistent memory. %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build # Currently, NVML makefiles do not allow to easily override CFLAGS, @@ -565,7 +639,8 @@ cp utils/nvml.magic %{buildroot}%{_datadir}/nvml/ %check -cp src/test/testconfig.sh.example src/test/testconfig.sh +echo "PMEM_FS_DIR=/tmp" > src/test/testconfig.sh +echo "PMEM_FS_DIR_FORCE_PMEM=1" >> src/test/testconfig.sh make check @@ -583,7 +658,8 @@ make check %postun -n libvmmalloc -p /sbin/ldconfig %post -n libpmempool -p /sbin/ldconfig %postun -n libpmempool -p /sbin/ldconfig - +%post -n librpmem -p /sbin/ldconfig +%postun -n librpmem -p /sbin/ldconfig %if 0%{?__debug_package} == 0 %debug_package @@ -591,6 +667,18 @@ make check %changelog +* Thu Oct 19 2017 Jeff Moyer - 1.3-3.el7 +- fix up issues found by the clang static checker +- Related: rhbz#1455216 + +* Wed Oct 18 2017 Jeff Moyer - 1.3-2.el7 +- pull in spec changes from upstream +- Related: rhbz#1455216 + +* Mon Oct 16 2017 Jeff Moyer - 1.3-1.el7 +- rebase to version 1.3 +- Resolves: rhbz#1455216 + * Wed Apr 05 2017 Jeff Moyer - 1.2.1-4.el7 - Fix mapping type in pool params parse - Resolves: bz#1436820