37 lines
994 B
Plaintext
37 lines
994 B
Plaintext
Index: pciutils-2.2.4/update-pciids.sh
|
|
================================================================================
|
|
--- pciutils-2.2.6/Makefile
|
|
+++ pciutils-2.2.6/Makefile
|
|
@@ -47,7 +47,7 @@
|
|
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 $@
|
|
|
|
%.8: %.man
|
|
--- pciutils-2.2.6/update-pciids.sh
|
|
+++ pciutils-2.2.6/update-pciids.sh
|
|
@@ -2,7 +2,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
|
|
|
|
@@ -54,5 +54,11 @@
|
|
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
|
|
|
|
echo "Done."
|