Commit b22dade9 authored by Philip Carns's avatar Philip Carns

rename pmem->pmdk package

- match new software naming
- a few minor cleanups in pkg
parent 0bacb38e
......@@ -21,7 +21,7 @@ class Bake(AutotoolsPackage):
depends_on('margo@0.4:')
depends_on('remi@0.1:')
depends_on('libuuid')
depends_on('pmem')
depends_on('pmdk')
def configure_args(self):
spec = self.spec
......
......@@ -10,7 +10,7 @@ class LibpmemobjCpp(CMakePackage):
version('master', git='https://github.com/pmem/libpmemobj-cpp.git')
depends_on('pmem@1.4')
depends_on('pmdk@1.4')
def cmake_args(self):
# Add arguments other than
......
......@@ -27,12 +27,14 @@ import spack.architecture
import os
class Pmem(Package):
"""The NVM Library is a library for using memory-mapped persistence, optimized specifically for persistent memory"""
class Pmdk(Package):
"""The Persistent Memory Development Kit (PMDK), formerly known as NVML, is a library for using memory-mapped persistence, optimized specifically for persistent memory"""
homepage = "http://pmem.io/"
url = "https://github.com/pmem/nvml/archive/1.4.tar.gz"
homepage = "http://pmem.io/pmdk/"
url = "https://github.com/pmem/pmdk/archive/1.5.tar.gz"
git = "https://github.com/pmem/pmdk.git"
version('develop', branch='master')
version('1.5', sha256='6b069d7207febeb62440e89245e8b18fcdf40b6170d2ec2ef33c252ed16db2d4')
# in the nvml -> pmdk name change, these hashes needed to be updated
version('1.4.2', sha256='df7e658e75d28cd80f6d2ff7b9fc9ae2885d52f8923fdbacecfd46215115fb4c')
......@@ -46,6 +48,7 @@ class Pmem(Package):
# documentation requires doxygen and a bunch of other depenedncies that
# were not working properly on our contianers
patch('0001-make-doc-building-explicit.patch')
patch('0002-remove-secure-getenv.patch', when='@1.4:')
def install(self, spec, prefix):
......
From 7e180535a3c3e3c38270474168aba4492feaa14a Mon Sep 17 00:00:00 2001
From: Krzysztof Czurylo <krzysztof.czurylo@intel.com>
Date: Tue, 18 Jul 2017 13:14:50 +0200
Subject: [PATCH] benchmark: fix buffer overflow in rpmem_persist
Ref: pmem/issues#600
---
src/benchmarks/rpmem_persist.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/benchmarks/rpmem_persist.cpp b/src/benchmarks/rpmem_persist.cpp
index 8f10a5c4..a7872ae5 100644
--- a/src/benchmarks/rpmem_persist.cpp
+++ b/src/benchmarks/rpmem_persist.cpp
@@ -284,11 +284,7 @@ rpmem_poolset_init(const char *path, struct rpmem_bench *mb,
struct rpmem_pool_attr attr;
memset(&attr, 0, sizeof(attr));
- int ret = snprintf(attr.signature, sizeof(attr.signature), "PMEMBENCH");
- if (ret < 0) {
- perror("snprintf");
- return -1;
- }
+ memcpy(attr.signature, "PMEMBNCH", sizeof(attr.signature));
/* read and validate poolset */
if (util_poolset_read(&set, path)) {
--
2.14.1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment