pciutils/update-pciutils-dist
Anna Maresova bfa61b1673 - update to 3.1.4
* Updated pci.ids to the today's snapshot of the database.
 * Fixed memory and file descriptor leak in the dump back-end.
 * The SR-IOV capability decoder now prints the VF BAR's.
 * On request of certain company's lawyers, we now include a copy
   of the GPL with our package. It seems that the pciutils are getting
   mature if the most important bug of the month was this one ;-)

OBS-URL: https://build.opensuse.org/package/show/Base:System/pciutils?expand=0&rev=10
2009-12-10 13:47:48 +00:00

40 lines
1.2 KiB
Plaintext

Index: pciutils-3.1.3/Makefile
===================================================================
--- pciutils-3.1.3.orig/Makefile
+++ pciutils-3.1.3/Makefile
@@ -78,7 +78,7 @@ setpci.o: setpci.c pciutils.h $(PCIINC)
common.o: common.c pciutils.h $(PCIINC)
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
Index: pciutils-3.1.3/update-pciids.sh
===================================================================
--- pciutils-3.1.3.orig/update-pciids.sh
+++ pciutils-3.1.3/update-pciids.sh
@@ -4,7 +4,7 @@
set -e
SRC="http://pciids.sourceforge.net/v2.2/pci.ids"
-DEST=pci.ids
+DEST=pci.ids.d/pci.ids.dist
PCI_COMPRESSED_IDS=
GREP=grep
@@ -65,6 +65,12 @@ if [ -f $DEST ] ; then
fi
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.