pciutils/pciutils-3.2.0_update-dist.patch
Marcus Meissner 5b52495153 Accepting request 185026 from home:rudi_m:branches:Base:System
- Update to 3.2.0
  * On newer Linux systems, we use libkmod to look up kernel
    modules (modules.pcimap no longer exists.) To facilitate this,
    libpci is able to look up module aliases in sysfs.
  * Various minor bug fixes.
  * Updated pci.ids to the today's snapshot of the database.
- Update to 3.1.10
  * Decoding of LTR/OBFF in PCIe capabilities.
  * Various minor bug fixes.
  * Updated pci.ids to the today's snapshot of the database.
- rebase patches
- require libkmod

OBS-URL: https://build.opensuse.org/request/show/185026
OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=40
2013-07-31 09:43:20 +00:00

39 lines
1.3 KiB
Diff

diff -aur pciutils-3.2.0.orig//Makefile pciutils-3.2.0/Makefile
--- pciutils-3.2.0.orig//Makefile 2013-04-19 14:58:49.000000000 +0200
+++ pciutils-3.2.0/Makefile 2013-07-30 23:03:04.385436935 +0200
@@ -85,7 +85,7 @@
ls-kernel.o: CFLAGS+=$(LIBKMOD_CFLAGS)
update-pciids: update-pciids.sh
- sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
+ sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids.d/pci.ids.dist@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=@"
chmod +x $@
# The example of use of libpci
diff -aur pciutils-3.1.9.orig/update-pciids.sh pciutils-3.1.9/update-pciids.sh
--- pciutils-3.1.9.orig/update-pciids.sh 2012-01-14 09:29:38.000000000 -0500
+++ pciutils-3.1.9/update-pciids.sh 2012-01-28 21:05:57.719301612 -0500
@@ -4,7 +4,7 @@
set -e
SRC="http://pci-ids.ucw.cz/v2.2/pci.ids"
-DEST=pci.ids
+DEST=pci.ids.d/pci.ids.dist
PCI_COMPRESSED_IDS=
GREP=grep
@@ -66,6 +66,13 @@
mv $DEST.neww $DEST
rm $DEST.new
+if [ -x /usr/bin/merge-pciids -a -x /usr/bin/perl ]; then
+ merge-pciids
+else
+ echo "WARNING: merge-pciids or perl missing"
+ cp -p $DEST /usr/share/pci.ids
+fi
+
# Older versions did not compress the ids file, so let's make sure we
# clean that up.
if [ ${DEST%.gz} != ${DEST} ] ; then