packages/nvml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.13.1

Browse Source
This commit is contained in:
lyn1001 2023-09-05 11:38:40 +08:00
parent 1b882651e3
commit a2fbe47866
6 changed files with 23 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
delete-extra-tests.patch
View File

@ -1,56 +0,0 @@
diff -ruN pmdk/src/test/Makefile pmdk-1.12.1/src/test/Makefile
--- pmdk/src/test/Makefile 2022-11-17 17:53:30.000000000 +0800
+++ pmdk-1.12.1/src/test/Makefile 1970-01-01 08:00:00.000000000 +0800
@@ -109,7 +109,6 @@
obj_tx_add_range\
obj_tx_add_range_direct\
obj_tx_callbacks\
- obj_tx_flow\
obj_tx_free\
obj_tx_invalid\
obj_tx_lock\
@@ -152,7 +151,6 @@
set_funcs\
traces\
traces_custom_function\
- traces_pmem\
unicode_api\
unicode_match_script\
util_badblock\
@@ -166,7 +164,6 @@
util_map_proc\
util_parse_size\
util_pool_hdr\
- util_poolset\
util_poolset_foreach\
util_poolset_parse\
util_poolset_size\
@@ -244,12 +241,10 @@
endif
PMEMPOOL_TESTS = \
- pmempool_check\
pmempool_create\
pmempool_dump\
pmempool_feature\
pmempool_help\
- pmempool_info\
pmempool_rm\
pmempool_sync\
pmempool_transform
@@ -262,7 +257,6 @@
rpmem_obc\
rpmem_obc_int\
rpmem_proto\
- rpmemd_config\
rpmemd_db\
rpmemd_dbg\
rpmemd_log\
@@ -291,7 +285,6 @@
LIBPMEMPOOL_TESTS = \
libpmempool_include\
libpmempool_backup\
- libpmempool_bttdev\
libpmempool_check_version\
libpmempool_feature\
libpmempool_map_flog\

74
fix-build-error.patch
View File

@ -1,74 +0,0 @@
diff -ruN pmdk/src/test/blk_rw/blk_rw.c pmdk-1.12.1/src/test/blk_rw/blk_rw.c
--- pmdk/src/test/blk_rw/blk_rw.c 2022-11-17 17:53:30.000000000 +0800
+++ pmdk-1.12.1/src/test/blk_rw/blk_rw.c 2022-12-04 20:47:41.633505093 +0800
@@ -63,7 +63,7 @@
const char *path = argv[2];
- PMEMblkpool *handle;
+ PMEMblkpool *handle = NULL;
switch (*argv[3]) {
case 'c':
handle = pmemblk_create(path, Bsize, 0,
diff -ruN pmdk/src/test/obj_realloc/obj_realloc.c pmdk-1.12.1/src/test/obj_realloc/obj_realloc.c
--- pmdk/src/test/obj_realloc/obj_realloc.c 2022-11-17 17:53:31.000000000 +0800
+++ pmdk-1.12.1/src/test/obj_realloc/obj_realloc.c 2022-12-04 20:47:41.633505093 +0800
@@ -150,8 +150,8 @@
UT_ASSERT(usable_size_from >= size_from);
- size_t check_size;
- uint16_t checksum;
+ size_t check_size = 0;
+ uint16_t checksum = 0;
if (zrealloc) {
UT_ASSERT(util_is_zeroed(D_RO(D_RO(root)->obj),
diff -ruN pmdk/src/test/unittest/unittest.h pmdk-1.12.1/src/test/unittest/unittest.h
--- pmdk/src/test/unittest/unittest.h 2022-11-17 17:53:31.000000000 +0800
+++ pmdk-1.12.1/src/test/unittest/unittest.h 2022-12-04 20:47:41.633505093 +0800
@@ -102,6 +102,13 @@
/* XXX - fix this temp hack dup'ing util_strerror when we get mock for win */
void ut_strerror(int errnum, char *buff, size_t bufflen);
+int ut_snprintf(const char *file, int line, const char *func,
+ char *str, size_t size, const char *format, ...);
+
+#define SNPRINTF(str, size, format, ...) \
+ ut_snprintf(__FILE__, __LINE__, __func__, \
+ str, size, format, __VA_ARGS__)
+
/* XXX - eliminate duplicated definitions in unittest.h and util.h */
#ifdef _WIN32
static inline int ut_util_statW(const wchar_t *path,
diff -ruN pmdk/src/test/unittest/ut.c pmdk-1.12.1/src/test/unittest/ut.c
--- pmdk/src/test/unittest/ut.c 2022-11-17 17:53:31.000000000 +0800
+++ pmdk-1.12.1/src/test/unittest/ut.c 2022-12-04 20:47:41.633505093 +0800
@@ -1094,6 +1094,27 @@
}
#endif
+int
+ut_snprintf(const char *file, int line, const char *func,
+ char *str, size_t size, const char *format, ...)
+ {
+ va_list ap;
+ va_start(ap, format);
+ int ret = vsnprintf(str, size, format, ap);
+ va_end(ap);
+
+ if (ret < 0) {
+ if (!errno)
+ errno = EIO;
+ ut_fatal(file, line, func, "!snprintf");
+ } else if ((size_t)ret >= size) {
+ errno = ENOBUFS;
+ ut_fatal(file, line, func, "!snprintf");
+ }
+
+ return ret;
+ }
+
/*
* ut_strtoi -- a strtoi call that cannot return error
*/

15
fix-gcc-check-uninitialized.patch
View File

@ -7,19 +7,8 @@ diff -ruN pmdk/src/examples/libpmem2/unsafe_shutdown/unsafe_shutdown.c pmdk-1.12
- struct user_data *data;
- size_t size;
+ struct user_data *data = NULL;
+ size_t size = 0;
+ struct user_data *data = NULL;
+ size_t size = 0;
enum pool_state state = pool_access_data(pool, (void **)&data, &size);
int ret = 1;
diff -ruN pmdk/src/examples/librpmem/hello.c pmdk-1.12.1/src/examples/librpmem/hello.c
--- pmdk/src/examples/librpmem/hello.c 2022-11-17 17:53:30.000000000 +0800
+++ pmdk-1.12.1/src/examples/librpmem/hello.c 2022-12-04 21:30:57.093856024 +0800
@@ -41,6 +41,7 @@
{
hello->lang = lang;
strncpy(hello->str, hello_str[hello->lang], STR_SIZE);
+ hello->str[STR_SIZE-1] = '\0';
}
static void

BIN
nvml-1.12.1.tar.gz
View File

Binary file not shown.

72
nvml.spec
View File

@ -2,16 +2,16 @@
%define min_libfabric_ver 1.4.2
%define min_ndctl_ver 60.1
%define upstreamversion 1.12.1
%define upstreamversion 1.13.1
Name: nvml
Summary: Persistent Memory Development Kit (formerly NVML)
Version: 1.12.1
Version: 1.13.1
Release: 1
License: BSD-3-Clause
URL: http://pmem.io/pmdk
Source0: https://github.com/pmem/%{name}/archive/%{upstreamversion}.tar.gz#/%{name}-%{upstreamversion}.tar.gz
Source0: https://github.com/pmem/pmdk/releases/download/%{upstreamversion}/pmdk-%{upstreamversion}.tar.gz
BuildRequires: gcc make glibc-devel autoconf automake man doxygen pkgconfig cmake
BuildRequires: ndctl-devel >= %{min_ndctl_ver} daxctl-devel >= %{min_ndctl_ver}
@ -21,7 +21,6 @@ Requires: libfabric >= %{min_libfabric_ver} openssh-clients
ExclusiveArch: x86_64
Provides: libpmemobj++-static = %{version}-%{release}
Obsoletes: nvml-tools < %{version}-%{release}
Obsoletes: libpmemblk-debug < %{version}-%{release}
@ -31,30 +30,20 @@ Obsoletes: libpmem-debug < %{version}-%{release}
Obsoletes: libpmem-devel < %{version}-%{release}
Obsoletes: libpmemlog < %{version}-%{release}
Obsoletes: libpmem < %{version}-%{release}
Obsoletes: libpmemobj++-devel < %{version}-%{release}
Obsoletes: libvmmalloc-debug < %{version}-%{release}
Obsoletes: libvmmalloc-devel < %{version}-%{release}
Obsoletes: libvmmalloc < %{version}-%{release}
Obsoletes: libvmem-debug < %{version}-%{release}
Obsoletes: libvmem-devel < %{version}-%{release}
Obsoletes: libvmem < %{version}-%{release}
Obsoletes: libpmemobj-devel < %{version}-%{release}
Obsoletes: libpmemobj < %{version}-%{release}
Obsoletes: libpmemlog-debug < %{version}-%{release}
Obsoletes: libpmemlog-devel < %{version}-%{release}
Obsoletes: daxio < %{version}-%{release}
Obsoletes: libpmemcto-devel < %{version}-%{release}
Obsoletes: pmempool < %{version}-%{release}
Obsoletes: libpmemcto-debug < %{version}-%{release}
Obsoletes: libpmemcto < %{version}-%{release}
Obsoletes: rpmemd < %{version}-%{release}
Obsoletes: libpmempool < %{version}-%{release}
Obsoletes: libpmempool-devel < %{version}-%{release}
Obsoletes: libpmempool-debug < %{version}-%{release}
Obsoletes: librpmem < %{version}-%{release}
Obsoletes: librpmem-devel < %{version}-%{release}
Obsoletes: libpmemobj-debug < %{version}-%{release}
Obsoletes: librpmem-debug < %{version}-%{release}
Obsoletes: libpmem2 < %{version}-%{release}
Obsoletes: libpmem2-debug < %{version}-%{release}
Obsoletes: libpmem2-devel < %{version}-%{release}
Obsoletes: pmreorder < %{version}-%{release}
Provides: libpmemblk-debug = %{version}-%{release}
Provides: libpmemblk-devel = %{version}-%{release}
@ -63,34 +52,22 @@ Provides: libpmem-debug = %{version}-%{release}
Provides: libpmem-devel = %{version}-%{release}
Provides: libpmemlog = %{version}-%{release}
Provides: libpmem = %{version}-%{release}
Provides: libpmemobj++-devel = %{version}-%{release}
Provides: libvmmalloc-debug = %{version}-%{release}
Provides: libvmmalloc-devel = %{version}-%{release}
Provides: libvmmalloc = %{version}-%{release}
Provides: libvmem-debug = %{version}-%{release}
Provides: libvmem-devel = %{version}-%{release}
Provides: libvmem = %{version}-%{release}
Provides: libpmemobj-devel = %{version}-%{release}
Provides: libpmemobj
Provides: libpmemobj = %{version}-%{release}
Provides: libpmemlog-debug = %{version}-%{release}
Provides: libpmemlog-devel = %{version}-%{release}
Provides: daxio
Provides: libpmemcto-devel = %{version}-%{release}
Provides: daxio = %{version}-%{release}
Provides: pmempool = %{version}-%{release}
Provides: libpmemcto-debug = %{version}-%{release}
Provides: libpmemcto = %{version}-%{release}
Provides: rpmemd = %{version}-%{release}
Provides: libpmempool = %{version}-%{release}
Provides: libpmempool-devel = %{version}-%{release}
Provides: libpmempool-debug = %{version}-%{release}
Provides: librpmem = %{version}-%{release}
Provides: librpmem-devel = %{version}-%{release}
Provides: libpmemobj-debug = %{version}-%{release}
Provides: librpmem-debug = %{version}-%{release}
Provides: libpmem2 = %{version}-%{release}
Provides: libpmem2-debug = %{version}-%{release}
Provides: libpmem2-devel = %{version}-%{release}
Provides: pmreorder = %{version}-%{release}
Patch0000: fix-build-error.patch
Patch0001: delete-extra-tests.patch
Patch0002: fix-gcc-check-uninitialized.patch
Patch0000: fix-gcc-check-uninitialized.patch
%description
The Persistent Memory Development Kit (PMDK), formerly known as NVML, is
@ -105,10 +82,11 @@ memory as memory-mapped files
%autosetup -p1 -n pmdk-%{upstreamversion}
%build
%define _lto_cflags %{nil}
CFLAGS="%{optflags}" \
LDFLAGS="%{?__global_ldflags}" \
make %{?_smp_mflags} NORPATH=1 WEB=1
make %{?_smp_mflags} NORPATH=1
%install
make install DESTDIR=%{buildroot} \
@ -119,8 +97,8 @@ make install DESTDIR=%{buildroot} \
mandir=%{_mandir} \
bindir=%{_bindir} \
sysconfdir=%{_sysconfdir} \
docdir=%{_docdir} \
CPP_DOC_DIR=libpmemobj++-devel
docdir=%{_docdir}
mkdir -p %{buildroot}%{_datadir}/pmdk
cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/
@ -175,13 +153,6 @@ echo "PMEM_FS_DIR_FORCE_PMEM=1" >> src/test/testconfig.sh
%{_includedir}/libpmempool.h
%{_libdir}/pmdk_debug/libpmempool.so
%{_libdir}/pmdk_debug/libpmempool.so.*
%{_libdir}/librpmem.so.*
%{_libdir}/librpmem.so
%{_libdir}/pkgconfig/librpmem.pc
%{_includedir}/librpmem.h
%{_libdir}/pmdk_debug/librpmem.so
%{_libdir}/pmdk_debug/librpmem.so.*
%{_bindir}/rpmemd
%{_bindir}/pmempool
%config(noreplace) %{_sysconfdir}/bash_completion.d/pmempool
%{_bindir}/daxio
@ -192,7 +163,6 @@ echo "PMEM_FS_DIR_FORCE_PMEM=1" >> src/test/testconfig.sh
%{_mandir}/man1/pmempool.1.gz
%{_mandir}/man1/pmempool-*.1.gz
%{_mandir}/man1/daxio.1.gz
%{_mandir}/man1/rpmemd.1.gz
%{_mandir}/man3/pmem_*.3.gz
%{_mandir}/man3/pmemblk_*.3.gz
%{_mandir}/man3/pmemlog_*.3.gz
@ -204,14 +174,12 @@ echo "PMEM_FS_DIR_FORCE_PMEM=1" >> src/test/testconfig.sh
%{_mandir}/man3/d_r*.3.gz
%{_mandir}/man3/tx_*.3.gz
%{_mandir}/man3/pmempool_*.3.gz
%{_mandir}/man3/rpmem_*.3.gz
%{_mandir}/man5/poolset.5.gz
%{_mandir}/man7/libpmem.7.gz
%{_mandir}/man7/libpmemblk.7.gz
%{_mandir}/man7/libpmemlog.7.gz
%{_mandir}/man7/libpmemobj.7.gz
%{_mandir}/man7/libpmempool.7.gz
%{_mandir}/man7/librpmem.7.gz
%{_mandir}/man1/pmreorder.1.gz
%{_mandir}/man3/pmem2_async.3.gz
%{_mandir}/man3/pmem2_badblock_clear.3.gz
@ -273,12 +241,14 @@ echo "PMEM_FS_DIR_FORCE_PMEM=1" >> src/test/testconfig.sh
%{_mandir}/man7/libpmem2.7.gz
%{_mandir}/man7/libpmem2_unsafe_shutdown.7.gz
%if 0%{?__debug_package} == 0
%debug_package
%endif
%changelog
* Tue Sep 5 2023 liyanan <thistleslyn@163.com> - 1.13.1-1
- update to 1.13.1
* Mon Jan 16 2023 dan <fzhang@zhixundn.com> 1.12.1-1
- update to 1.12.1

BIN
pmdk-1.13.1.tar.gz Normal file
View File

Binary file not shown.