rpms/nvml
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import nvml-1.10.1-1.el9

Browse Source
This commit is contained in:
CentOS Sources 2021-12-07 12:20:54 -05:00 committed by Stepan Oksanichenko
parent 4e1e1410f9
commit 75c8c28bcc
5 changed files with 21 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/pmdk-1.10-man.tar.gz
SOURCES/pmdk-1.10.tar.gz
SOURCES/pmdk-1.10.1-man.tar.gz
SOURCES/pmdk-1.10.1.tar.gz

4
.nvml.metadata
View File

@ -1,2 +1,2 @@
a6d91d9ee73f64512f680b8f279b7c070429eca0 SOURCES/pmdk-1.10-man.tar.gz
6121fe566f484d5a13b163916ffec6ee5a7fbef3 SOURCES/pmdk-1.10.tar.gz
0f61c6dba3937a288dc90d8d16073b36cb117e93 SOURCES/pmdk-1.10.1-man.tar.gz
935735fab582deb56388eb09387ec0a6038e9177 SOURCES/pmdk-1.10.1.tar.gz

26
SOURCES/0001-common-fix-a-mismatch-between-prototype-and-body.patch
View File

@ -1,26 +0,0 @@
From 57a7e50be71e2677a5cb1a84b5f462d40182dee8 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Fri, 29 Jan 2021 11:48:00 +0100
Subject: [PATCH] common: fix a mismatch between prototype and body
It makes gcc-11 complain.
---
src/common/uuid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/uuid.c b/src/common/uuid.c
index 94fdd737c..da59208fb 100644
--- a/src/common/uuid.c
+++ b/src/common/uuid.c
@@ -53,7 +53,7 @@ util_uuid_to_string(const uuid_t u, char *buf)
* f81d4fae-7dec-11d0-a765-00a0c91e6bf6
*/
int
-util_uuid_from_string(const char *uuid, struct uuid *ud)
+util_uuid_from_string(const char uuid[POOL_HDR_UUID_STR_LEN], struct uuid *ud)
{
if (strlen(uuid) != 36) {
LOG(2, "invalid uuid string");
--
2.27.0

29
SOURCES/0001-test-util_badblock-don-t-pass-uninitialized-attr.patch
View File

@ -1,29 +0,0 @@
From 16140fa1c132316fa806e569e50fbb4938246372 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Sat, 12 Dec 2020 12:46:17 +0100
Subject: [PATCH] test: util_badblock: don't pass uninitialized attr
---
src/test/util_badblock/util_badblock.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/test/util_badblock/util_badblock.c b/src/test/util_badblock/util_badblock.c
index a2274c79f..eb9aaa0aa 100644
--- a/src/test/util_badblock/util_badblock.c
+++ b/src/test/util_badblock/util_badblock.c
@@ -104,11 +104,10 @@ static void
do_open(const char *path)
{
struct pool_set *set;
- const struct pool_attr attr;
unsigned nlanes = 1;
if (util_pool_open(&set, path, MIN_PART,
- &attr, &nlanes, NULL, 0) != 0) {
+ NULL, &nlanes, NULL, 0) != 0) {
UT_FATAL("!util_pool_open: %s", path);
}
--
2.27.0

40
SPECS/nvml.spec
View File

@ -1,21 +1,14 @@
# rpmbuild options:
# --with | --without fabric
# --with | --without ndctl
# do not terminate build if files in the $RPM_BUILD_ROOT
# directory are not found in %%files (without fabric case)
# directory are not found in %%files (without pmemcheck case)
%define _unpackaged_files_terminate_build 0
# disable 'make check'
%define _skip_check 1
%if (0%{?suse_version} > 1315) || (0%{?fedora} >= 27) || (0%{?rhel} >= 7)
%bcond_without fabric
%else
%bcond_with fabric
%endif
# by default build with ndctl, unless explicitly disabled
%bcond_without ndctl
@ -23,13 +16,12 @@
# pmemcheck is not packaged by Fedora
%bcond_with pmemcheck
%define min_libfabric_ver 1.4.2
%define min_ndctl_ver 60.1
%define upstreamversion 1.10
%define upstreamversion 1.10.1
Name: nvml
Version: 1.10
Release: 10%{?dist}
Version: 1.10.1
Release: 1%{?dist}
Summary: Persistent Memory Development Kit (formerly NVML)
License: BSD
URL: http://pmem.io/pmdk
@ -43,9 +35,7 @@ Source1: pmdk-%{version}-man.tar.gz
# do_open passes "attr" to util_pool_open which potentially reads that object
# but do_open never initializes "attr"
# may read that object
Patch0: 0001-test-util_badblock-don-t-pass-uninitialized-attr.patch
Patch1: 0001-common-fix-a-mismatch-between-prototype-and-body.patch
Patch2: Makefile-bypass-check-doc-in-check.patch
Patch0: Makefile-bypass-check-doc-in-check.patch
BuildRequires: gcc
@ -63,10 +53,6 @@ BuildRequires: ndctl-devel >= %{min_ndctl_ver}
BuildRequires: daxctl-devel >= %{min_ndctl_ver}
%endif
%if %{with fabric}
BuildRequires: libfabric-devel >= %{min_libfabric_ver}
%endif
# for tests
BuildRequires: gdb
BuildRequires: bc
@ -524,8 +510,6 @@ provided in the command line options to check whether files are in a consistent
%prep
%setup -q -n pmdk-%{upstreamversion}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
@ -608,9 +592,19 @@ mkdir -p %{buildroot}%{_mandir}
%changelog
* Fri Sep 17 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-10
* Thu Oct 14 2021 Bryan Gurney <bgurney@redhat.com> - 1.10.1-1
- Update to PMDK version 1.10.1
- Related: rhbz#1874208
- Remove BuildRequires line for libfabric-devel
- Related: rhbz#2009502
* Mon Oct 04 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-11
- Do not generate librpmem man pages
- Related: rhbz#2002998
* Thu Sep 16 2021 Bryan Gurney <bgurney@redhat.com> - 1.10-10
- Do not build librpmem packages
- Related: rhbz#1965647
- Related: rhbz#2002998
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.10-9
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags