This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
c756f3d744
commit
b88b4820f1
@ -1,32 +0,0 @@
|
||||
--- lspci.c
|
||||
+++ lspci.c
|
||||
@@ -64,6 +64,9 @@
|
||||
#define alloca xmalloc
|
||||
#endif
|
||||
|
||||
+/* error return val */
|
||||
+static int error = 0;
|
||||
+
|
||||
/* Our view of the PCI bus */
|
||||
|
||||
struct device {
|
||||
@@ -120,8 +123,10 @@
|
||||
d->config = xmalloc(64);
|
||||
d->present = xmalloc(64);
|
||||
memset(d->present, 1, 64);
|
||||
- if (!pci_read_block(p, 0, d->config, 64))
|
||||
- die("Unable to read the standard configuration space header");
|
||||
+ if (!pci_read_block(p, 0, d->config, 64)) {
|
||||
+ fprintf (stderr, "Unable to read the standard configuration space header\n");
|
||||
+ error++; return d;
|
||||
+ }
|
||||
if ((d->config[PCI_HEADER_TYPE] & 0x7f) == PCI_HEADER_TYPE_CARDBUS)
|
||||
{
|
||||
/* For cardbus bridges, we need to fetch 64 bytes more to get the
|
||||
@@ -2401,5 +2406,5 @@
|
||||
}
|
||||
pci_cleanup(pacc);
|
||||
|
||||
- return 0;
|
||||
+ return (error? 2: 0);
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:62fc07f688c6d17f0cf8baa540e42be6117530360c2df491ec02031973506a9f
|
||||
size 210706
|
||||
3
pciutils-2.2.5.tar.bz2
Normal file
3
pciutils-2.2.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:178070815bd52e08aaafad533e37a47f6fa8ed81edbcbfe7700cc5d055ab8afe
|
||||
size 204718
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 4 20:41:39 CEST 2007 - anicka@suse.cz
|
||||
|
||||
- update to 2.2.5
|
||||
* pci.ids: Updated to the current snapshot of the database.
|
||||
* lspci.c (show_express): Added PCI/PCI-X to PCI-Express
|
||||
Bridge type.
|
||||
* pci.ids: Updated to the current snapshot of the database.
|
||||
* Replaced bzero() by memset() everywhere, it's better to lose
|
||||
a tiny bit of readability than maintain hacks to make it work
|
||||
on various systems.
|
||||
* lib/configure: tr on Solaris is a bit weird and it requires
|
||||
`[A-Z]' instead of `A-Z'. Fortunately, the extra brackets
|
||||
don't hurt otherwise.
|
||||
* lib/types.h, lib/configure: Solaris should use <stdint.h>
|
||||
to get precise integer types.
|
||||
* lspci.c: alloca() needs <alloca.h>.
|
||||
* lib/dump.c: Fixed a couple of bugs in the dump backend which
|
||||
caused devices with domains or with extended config space
|
||||
to be read incorrectly. Also, dumps with partial lines are
|
||||
allowed now.
|
||||
* lspci.c (scan_device): If an error occurs when reading the
|
||||
standard config header of a device, report it and ignore the
|
||||
device and return with exit code 2 at the end.
|
||||
- remove noabort.diff (implemented by upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 29 12:34:27 CEST 2007 - rguenther@suse.de
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package pciutils (Version 2.2.4)
|
||||
# spec file for package pciutils (Version 2.2.5)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -12,20 +12,18 @@
|
||||
|
||||
Name: pciutils
|
||||
BuildRequires: zlib-devel
|
||||
Version: 2.2.4
|
||||
Release: 25
|
||||
%define ver 2.2.4
|
||||
Version: 2.2.5
|
||||
Release: 1
|
||||
Requires: pciutils-ids
|
||||
Autoreqprov: on
|
||||
Group: Hardware/Other
|
||||
License: GNU General Public License (GPL)
|
||||
Summary: PCI-utilities for Kernel version 2.2 and newer
|
||||
URL: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
|
||||
Source: ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{ver}.tar.gz
|
||||
Patch0: %{name}-%{ver}-class.diff
|
||||
Patch1: %{name}-%{ver}-noabort.diff
|
||||
Patch2: %{name}-%{ver}-strip.diff
|
||||
Patch3: update-pciutils-dist
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Patch0: %{name}-%{version}-class.diff
|
||||
Patch1: %{name}-%{version}-strip.diff
|
||||
Patch2: update-pciutils-dist
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -62,11 +60,10 @@ Authors:
|
||||
Martin Mares <mj@ucw.cz>
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{ver}
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
make OPT="$RPM_OPT_FLAGS -Wall" PREFIX=%{_prefix} SBINDIR=/sbin
|
||||
@ -95,6 +92,29 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_libdir}/libpci.a
|
||||
|
||||
%changelog
|
||||
* Fri May 04 2007 - anicka@suse.cz
|
||||
- update to 2.2.5
|
||||
* pci.ids: Updated to the current snapshot of the database.
|
||||
* lspci.c (show_express): Added PCI/PCI-X to PCI-Express
|
||||
Bridge type.
|
||||
* pci.ids: Updated to the current snapshot of the database.
|
||||
* Replaced bzero() by memset() everywhere, it's better to lose
|
||||
a tiny bit of readability than maintain hacks to make it work
|
||||
on various systems.
|
||||
* lib/configure: tr on Solaris is a bit weird and it requires
|
||||
`[A-Z]' instead of `A-Z'. Fortunately, the extra brackets
|
||||
don't hurt otherwise.
|
||||
* lib/types.h, lib/configure: Solaris should use <stdint.h>
|
||||
to get precise integer types.
|
||||
* lspci.c: alloca() needs <alloca.h>.
|
||||
* lib/dump.c: Fixed a couple of bugs in the dump backend which
|
||||
caused devices with domains or with extended config space
|
||||
to be read incorrectly. Also, dumps with partial lines are
|
||||
allowed now.
|
||||
* lspci.c (scan_device): If an error occurs when reading the
|
||||
standard config header of a device, report it and ignore the
|
||||
device and return with exit code 2 at the end.
|
||||
- remove noabort.diff (implemented by upstream)
|
||||
* Thu Mar 29 2007 - rguenther@suse.de
|
||||
- add zlib-devel BuildRequires
|
||||
- require zlib-devel from pciutils-devel package
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user