From 37542058ceca831a0303b94c6cc566ef3154c95cd657ae173ee670bb6c0768b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 18 Nov 2014 13:30:50 +0000 Subject: [PATCH] - Version bump to 3.3.0: * Device names exported by BIOS are displayed on Linux. * On Linux systems, HWDB is used to look up device names when our ID database gives no match. (More precisely, HWDB is consulted after local pci.ids, but before using network to query online pci.ids.) Thanks to Tom Gundersen for the initial patch. * Added experimental back-end for OS X / Darwin. Thanks to Richard Yao for providing it. * Filters now support matching by device class. Original patch by Matthew Wilcox, wrappers for ABI compatibility by me. * Interrupt Pin and Interrupt Line registers are displayed for bridge devices, too. * Several portability bugs have been fixed. * Several typos have been fixed. Also, use of questionable constructs in man pages has been reduced. * PCIe link capabilities now include the ASPMOptComp bit. * The "CRS Software Visibility" bit is now decoded properly. * Updated pci.ids to the current snapshot of the database. - Refresh patch: * pciutils-endianh.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=46 --- pciutils-3.2.1.tar.xz | 3 --- pciutils-3.3.0.tar.xz | 3 +++ pciutils-endianh.patch | 29 ++++++++++++++++++----------- pciutils.changes | 26 ++++++++++++++++++++++++++ pciutils.spec | 12 ++---------- 5 files changed, 49 insertions(+), 24 deletions(-) delete mode 100644 pciutils-3.2.1.tar.xz create mode 100644 pciutils-3.3.0.tar.xz diff --git a/pciutils-3.2.1.tar.xz b/pciutils-3.2.1.tar.xz deleted file mode 100644 index f1939c8..0000000 --- a/pciutils-3.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d62f84fe7a7401af2ed62d6303255a0cf7333f606c136927f0ba9110ab6824a -size 282268 diff --git a/pciutils-3.3.0.tar.xz b/pciutils-3.3.0.tar.xz new file mode 100644 index 0000000..61e29f4 --- /dev/null +++ b/pciutils-3.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:413395d4bdc66fdedd6c993ed9083d1dd73812bf2a679d320f73de35c7801301 +size 306008 diff --git a/pciutils-endianh.patch b/pciutils-endianh.patch index b9b7136..18c5271 100644 --- a/pciutils-endianh.patch +++ b/pciutils-endianh.patch @@ -1,8 +1,7 @@ -Dear kernel developers. we plead to you, please use documented,optimized userspace interfaces, thanks ! - ---- lib/sysdep.h.orig -+++ lib/sysdep.h -@@ -18,71 +18,10 @@ +diff -urN pciutils-3.3.0.old/lib/sysdep.h pciutils-3.3.0/lib/sysdep.h +--- pciutils-3.3.0.old/lib/sysdep.h 2014-11-18 14:27:01.054393822 +0100 ++++ pciutils-3.3.0/lib/sysdep.h 2014-11-18 14:28:43.420561080 +0100 +@@ -18,79 +18,9 @@ typedef u8 byte; typedef u16 word; @@ -28,13 +27,21 @@ Dear kernel developers. we plead to you, please use documented,optimized userspa - -#ifdef PCI_OS_SUNOS -#include +-#if defined(__i386) && defined(LITTLE_ENDIAN) +-# define BYTE_ORDER LITTLE_ENDIAN +-#elif defined(__sparc) && defined(BIG_ENDIAN) +-# define BYTE_ORDER BIG_ENDIAN +-#else -#define BIG_ENDIAN 4321 +-#endif +-#ifndef BYTE_ORDER -#ifdef _LITTLE_ENDIAN -#define BYTE_ORDER 1234 -#else -#define BYTE_ORDER 4321 -#endif --#endif +-#endif /* BYTE_ORDER */ +-#endif /* PCI_OS_SUNOS */ - -#ifdef PCI_OS_WINDOWS -#ifdef __MINGW32__ @@ -58,7 +65,7 @@ Dear kernel developers. we plead to you, please use documented,optimized userspa -{ - return (w << 8) | ((w >> 8) & 0xff); -} - +- -static inline u32 swab32(u32 w) -{ - return ((w & 0xff000000) >> 24) | @@ -72,9 +79,9 @@ Dear kernel developers. we plead to you, please use documented,optimized userspa -#define le16_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#endif -+#define cpu_to_le16 htole16 -+#define cpu_to_le32 htole32 -+#define le16_to_cpu le16toh -+#define le32_to_cpu le32toh -#endif ++#define cpu_to_le16 htole16 ++#define cpu_to_le32 htole32 ++#define le16_to_cpu le16toh ++#define le32_to_cpu le32toh diff --git a/pciutils.changes b/pciutils.changes index 623281e..ffc1ad2 100644 --- a/pciutils.changes +++ b/pciutils.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Nov 18 13:22:45 UTC 2014 - tchvatal@suse.com + +- Version bump to 3.3.0: + * Device names exported by BIOS are displayed on Linux. + * On Linux systems, HWDB is used to look up device names + when our ID database gives no match. (More precisely, + HWDB is consulted after local pci.ids, but before using + network to query online pci.ids.) Thanks to Tom Gundersen + for the initial patch. + * Added experimental back-end for OS X / Darwin. Thanks to + Richard Yao for providing it. + * Filters now support matching by device class. Original + patch by Matthew Wilcox, wrappers for ABI compatibility + by me. + * Interrupt Pin and Interrupt Line registers are displayed + for bridge devices, too. + * Several portability bugs have been fixed. + * Several typos have been fixed. Also, use of questionable + constructs in man pages has been reduced. + * PCIe link capabilities now include the ASPMOptComp bit. + * The "CRS Software Visibility" bit is now decoded properly. + * Updated pci.ids to the current snapshot of the database. +- Refresh patch: + * pciutils-endianh.patch + ------------------------------------------------------------------- Mon Aug 18 16:21:23 UTC 2014 - fcrozat@suse.com diff --git a/pciutils.spec b/pciutils.spec index 50c7ab7..87343f5 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -18,7 +18,7 @@ %define lname libpci3 Name: pciutils -Version: 3.2.1 +Version: 3.3.0 Release: 0 Summary: PCI utilities for Kernel version 2 License: GPL-2.0+ @@ -35,10 +35,6 @@ BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(zlib) Requires: pciutils-ids BuildRoot: %{_tmppath}/%{name}-%{version}-build -# bug437293 -%ifarch ppc64 -Obsoletes: pciutils-64bit -%endif %description lspci: This program displays detailed information about all PCI busses @@ -62,10 +58,6 @@ libpci offers access to the PCI configuration space. Summary: Library and Include Files of the PCI utilities Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: pciutils-devel-64bit -%endif %description devel This package contains the files that are necessary for software @@ -76,7 +68,7 @@ development using the PCI utilities. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 +%patch3 -p1 %build make %{?_smp_mflags} OPT="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS) -Wall" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes"