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

updated to 3.13, adds support for cxl1.1 device link status information (#RHEL-29153)

Browse Source 
add riscv64 build support (#RHEL-40383)
Resolves: #RHEL-40383
This commit is contained in:
Michal Hlavinka 2024-06-11 00:15:13 +02:00
parent 33c3d955a0
commit d5b3cb50ee
6 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -24,3 +24,4 @@ pciutils-3.1.6.tar.gz
/pciutils-3.8.0.tar.xz /pciutils-3.8.0.tar.xz
/pciutils-3.9.0.tar.xz /pciutils-3.9.0.tar.xz
/pciutils-3.10.0.tar.xz /pciutils-3.10.0.tar.xz
/pciutils-3.13.0.tar.xz

1
libpci_symbols.lst
View File

@ -2,6 +2,7 @@ pci_alloc@LIBPCI_3.0
pci_cleanup@LIBPCI_3.0 pci_cleanup@LIBPCI_3.0
pci_fill_info@LIBPCI_3.0 pci_fill_info@LIBPCI_3.0
pci_fill_info@LIBPCI_3.1 pci_fill_info@LIBPCI_3.1
pci_fill_info@LIBPCI_3.13
pci_fill_info@LIBPCI_3.2 pci_fill_info@LIBPCI_3.2
pci_fill_info@LIBPCI_3.3 pci_fill_info@LIBPCI_3.3
pci_fill_info@LIBPCI_3.4 pci_fill_info@LIBPCI_3.4

2
multilibconfigh
View File

@ -1,6 +1,6 @@
#if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__aarch64__) || defined(__mips64) #if defined(__x86_64__) || defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__aarch64__) || defined(__mips64)
#include "config.lib64.h" #include "config.lib64.h"
#elif defined(__sparc__) && defined (__arch64__) #elif defined(__sparc__) && defined (__arch64__) || (defined(__riscv) && __SIZEOF_POINTER__ == 8)
#include "config.lib64.h" #include "config.lib64.h"
#elif defined(__i386__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__alpha__) || defined(__sparc__) || defined(__sh__) || defined(__arm__) || defined(__mips) #elif defined(__i386__) || defined(__ppc__) || defined(__powerpc__) || defined(__s390__) || defined(__alpha__) || defined(__sparc__) || defined(__sh__) || defined(__arm__) || defined(__mips)
#include "config.lib.h" #include "config.lib.h"

29
pciutils-dir-d.patch
View File

@ -1,8 +1,8 @@
diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c diff -up pciutils-3.11.0/lib/names-parse.c.2 pciutils-3.11.0/lib/names-parse.c
--- pciutils-3.0.0/lib/names-parse.c.dird 2008-04-10 21:15:47.000000000 +0200 --- pciutils-3.11.0/lib/names-parse.c.2 2024-02-18 01:43:33.000000000 +0100
+++ pciutils-3.0.0/lib/names-parse.c 2008-09-01 15:17:23.000000000 +0200 +++ pciutils-3.11.0/lib/names-parse.c 2024-02-26 20:12:44.682745480 +0100
@@ -6,10 +6,13 @@ @@ -8,10 +8,13 @@
* Can be freely distributed and used under the terms of the GNU GPL. * SPDX-License-Identifier: GPL-2.0-or-later
*/ */
+#define _GNU_SOURCE +#define _GNU_SOURCE
@ -15,7 +15,7 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c
#include "internal.h" #include "internal.h"
#include "names.h" #include "names.h"
@@ -82,7 +85,7 @@ static inline int id_white_p(int c) @@ -84,7 +87,7 @@ static inline int id_white_p(int c)
} }
@ -24,7 +24,7 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c
{ {
char line[MAX_LINE]; char line[MAX_LINE];
char *p; char *p;
@@ -207,7 +210,7 @@ static const char *id_parse_list(struct @@ -209,7 +212,7 @@ static const char *id_parse_list(struct
p++; p++;
if (!*p) if (!*p)
return parse_error; return parse_error;
@ -33,9 +33,9 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c
return "Duplicate entry"; return "Duplicate entry";
} }
return NULL; return NULL;
@@ -223,13 +226,14 @@ pci_load_name_list(struct pci_access *a) @@ -225,12 +228,13 @@ pci_load_name_list(struct pci_access *a)
pci_free_name_list(a); pci_free_name_list(a);
a->id_load_failed = 1; a->id_load_attempted = 1;
if (!(f = pci_open(a))) if (!(f = pci_open(a)))
- return 0; - return 0;
- err = id_parse_list(a, f, &lino); - err = id_parse_list(a, f, &lino);
@ -45,12 +45,11 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c
pci_close(f); pci_close(f);
if (err) if (err)
a->error("%s at %s, line %d\n", err, a->id_file_name, lino); a->error("%s at %s, line %d\n", err, a->id_file_name, lino);
a->id_load_failed = 0;
+ pci_new_load_name_list(a); + pci_new_load_name_list(a);
return 1; return 1;
} }
@@ -249,3 +253,49 @@ pci_set_name_list_path(struct pci_access @@ -251,3 +255,49 @@ pci_set_name_list_path(struct pci_access
a->id_file_name = name; a->id_file_name = name;
a->free_id_name = to_be_freed; a->free_id_name = to_be_freed;
} }
@ -100,10 +99,10 @@ diff -up pciutils-3.0.0/lib/names-parse.c.dird pciutils-3.0.0/lib/names-parse.c
+ closedir(pci_ids_dir); + closedir(pci_ids_dir);
+ return 1; + return 1;
+} +}
diff -up pciutils-3.0.0/lib/pci.h.dird pciutils-3.0.0/lib/pci.h diff -up pciutils-3.11.0/lib/pci.h.2 pciutils-3.11.0/lib/pci.h
--- pciutils-3.0.0/lib/pci.h.dird 2008-04-10 21:23:05.000000000 +0200 --- pciutils-3.11.0/lib/pci.h.2 2024-02-23 14:56:07.000000000 +0100
+++ pciutils-3.0.0/lib/pci.h 2008-09-01 15:17:23.000000000 +0200 +++ pciutils-3.11.0/lib/pci.h 2024-02-26 20:09:44.908200417 +0100
@@ -194,6 +194,7 @@ int pci_load_name_list(struct pci_access @@ -292,6 +292,7 @@ int pci_load_name_list(struct pci_access
void pci_free_name_list(struct pci_access *a) PCI_ABI; /* Called automatically by pci_cleanup() */ void pci_free_name_list(struct pci_access *a) PCI_ABI; /* Called automatically by pci_cleanup() */
void pci_set_name_list_path(struct pci_access *a, char *name, int to_be_freed) PCI_ABI; void pci_set_name_list_path(struct pci_access *a, char *name, int to_be_freed) PCI_ABI;
void pci_id_cache_flush(struct pci_access *a) PCI_ABI; void pci_id_cache_flush(struct pci_access *a) PCI_ABI;

8
pciutils.spec
View File

@ -1,6 +1,6 @@
Name: pciutils Name: pciutils
Version: 3.10.0 Version: 3.13.0
Release: 5%{?dist} Release: 1%{?dist}
Summary: PCI bus related utilities Summary: PCI bus related utilities
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://mj.ucw.cz/sw/pciutils/ URL: https://mj.ucw.cz/sw/pciutils/
@ -106,6 +106,10 @@ diff -u %{SOURCE2} libpci_symbols_new.lst
%{_mandir}/man7/* %{_mandir}/man7/*
%changelog %changelog
* Tue Jun 11 2024 Michal Hlavinka <mhlavink@redhat.com> - 3.13.0-1
- updated to 3.13, adds support for cxl1.1 device link status information (#RHEL-29153)
- add riscv64 build support (#RHEL-40383)
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-5 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
SHA512 (pciutils-3.10.0.tar.xz) = 7a2c1ca87be46647b964f7342a5887819e51678a4ee02b480f8f73e64124cc51ee09aafca41242c3b7d469cf2e9695ca4e9d8e62eda074496d0713553e59c34b SHA512 (pciutils-3.13.0.tar.xz) = 2c0a26d42a6f3b193ae0a7705344e22cf3f729b860a7cf0843e8102e4dfc3243b8112ed8fd79bd51b54773a172ab8fd75246c82b4d20add3f0773d86d4595712