diff --git a/.gitignore b/.gitignore index 53bb7b1..0860c42 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /pmdk-1.10.tar.gz /pmdk-1.11.0.tar.gz /pmdk-1.11.1.tar.gz +/pmdk-1.12.0.tar.gz diff --git a/0001-test-don-t-print-the-address-of-a-FILE-after-fclose.patch b/0001-test-don-t-print-the-address-of-a-FILE-after-fclose.patch deleted file mode 100644 index a8bad8b..0000000 --- a/0001-test-don-t-print-the-address-of-a-FILE-after-fclose.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ed81a44e6faffd450d9ab779a7c5862a9bd7c773 Mon Sep 17 00:00:00 2001 -From: Adam Borowski -Date: Thu, 27 Jan 2022 12:08:56 +0100 -Subject: [PATCH] test: don't print the address of a FILE after fclose - -In pre-release gcc-12 that Fedora releases with, it triggers --Werror=use-after-free despite us not dereferencing the pointer. -Its address is no longer useful for debugging anyway. ---- - src/test/unittest/ut_file.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/test/unittest/ut_file.c b/src/test/unittest/ut_file.c -index 26f5cbda6..266b86387 100644 ---- a/src/test/unittest/ut_file.c -+++ b/src/test/unittest/ut_file.c -@@ -88,10 +88,8 @@ ut_fclose(const char *file, int line, const char *func, FILE *stream) - { - int retval = os_fclose(stream); - -- if (retval != 0) { -- ut_fatal(file, line, func, "!fclose: 0x%llx", -- (unsigned long long)stream); -- } -+ if (retval != 0) -+ ut_fatal(file, line, func, "!fclose"); - - return retval; - } --- -2.34.1 - diff --git a/nvml.spec b/nvml.spec index 79189cb..0aece57 100644 --- a/nvml.spec +++ b/nvml.spec @@ -28,17 +28,17 @@ %define min_libfabric_ver 1.4.2 %define min_ndctl_ver 60.1 -%define upstreamversion 1.11.1 +%define upstreamversion 1.12.0 Name: nvml -Version: 1.11.1 -Release: 4%{?dist} +Version: 1.12.0 +Release: 1%{?dist} Summary: Persistent Memory Development Kit (formerly NVML) License: BSD URL: http://pmem.io/pmdk Source0: https://github.com/pmem/pmdk/releases/download/%{upstreamversion}/pmdk-%{upstreamversion}.tar.gz -Patch0: 0001-test-don-t-print-the-address-of-a-FILE-after-fclose.patch +#Patch0: 0001-test-don-t-print-the-address-of-a-FILE-after-fclose.patch BuildRequires: gcc @@ -51,10 +51,12 @@ BuildRequires: pkgconfig BuildRequires: python3 BuildRequires: pandoc BuildRequires: groff +BuildRequires: cmake %if %{with ndctl} BuildRequires: ndctl-devel >= %{min_ndctl_ver} BuildRequires: daxctl-devel >= %{min_ndctl_ver} +BuildRequires: ndctl %endif %if %{with fabric} @@ -76,6 +78,7 @@ BuildRequires: libunwind-devel # - x86_64 # - ppc64le (experimental) # - aarch64 (unmaintained, supporting hardware doesn't exist?) +# - riscv64 # # Other 64-bit architectures could also be supported, if only there is # a request for that, and if somebody provides the arch-specific @@ -184,6 +187,7 @@ convenient. %{_libdir}/libpmem2.so %{_libdir}/pkgconfig/libpmem2.pc %{_includedir}/libpmem2.h +%{_includedir}/libpmem2/*.h %{_mandir}/man7/libpmem2*7.gz %{_mandir}/man3/pmem2_*.3.gz %license LICENSE @@ -592,7 +596,7 @@ provided in the command line options to check whether files are in a consistent %prep %setup -q -n pmdk-%{upstreamversion} -%patch0 -p1 +#%patch0 -p1 %build @@ -659,6 +663,9 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/ rm -f src/test/rpmemd_dbg/TEST* rm -f src/test/rpmemd_log/TEST* + # bad on ppc64 + rm -f src/test/obj_ctl_arenas/TEST3 src/test/pmem2_future/TESTS.py + make pycheck make check %endif @@ -680,6 +687,11 @@ cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/ %changelog +* Mon Jul 4 2022 Adam Borowski - 1.12.0-1 +- PMDK 1.12.0 +- B-Require cmake. +- Drop two tests that fail on ppc64le. + * Fri Jan 28 2022 Adam Borowski - 1.11.1-4 - Drop two rpmemd tests. diff --git a/sources b/sources index 20fff7f..84f9cbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pmdk-1.11.1.tar.gz) = 100c7fd223675bf10649620a75d01c3fd0dbdd1a7b00d17878175559a5e5a0219180b08227688f715b0bc2002464c9146877c954aad33aff596e3cad0b2b67cb +SHA512 (pmdk-1.12.0.tar.gz) = b44380aad6deaf8a341b32ce864a4a115be2852829831c42bf7173bdbb21e5e69d7f431ed6fd91bb367660c7c9bf2a50207d5dee1e41bd4ef33947051d2c2530