[patch] Source patch to only use system's .ids files

lshw-B.02.10-sysids.patch (text/plain), 1.56 KB, created by Diego Elio Pettenò (RETIRED) on 2007-04-27 18:56:55 UTC

Index: lshw-B.02.10/src/core/pci.cc
===================================================================
--- lshw-B.02.10.orig/src/core/pci.cc
+++ lshw-B.02.10/src/core/pci.cc
@@ -12,7 +12,7 @@ __ID("@(#) $Id: pci.cc 1726 2007-02-13 2
 
 #define PROC_BUS_PCI "/proc/bus/pci"
 #define SYS_BUS_PCI "/sys/bus/pci"
-#define PCIID_PATH "/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
+#define PCIID_PATH "/usr/share/misc/pci.ids"
 
 #define PCI_CLASS_REVISION      0x08              /* High 24 bits are class, low 8 revision */
 #define PCI_VENDOR_ID           0x00    /* 16 bits */
Index: lshw-B.02.10/src/core/usb.cc
===================================================================
--- lshw-B.02.10.orig/src/core/usb.cc
+++ lshw-B.02.10/src/core/usb.cc
@@ -22,7 +22,7 @@
 #include <dirent.h>
 
 #define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
-#define USBID_PATH "/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
+#define USBID_PATH "/usr/share/misc/usb.ids"
 
 #define USB_CLASS_PER_INTERFACE         0         /* for DeviceClass */
 #define USB_CLASS_AUDIO                 1
Index: lshw-B.02.10/src/Makefile
===================================================================
--- lshw-B.02.10.orig/src/Makefile
+++ lshw-B.02.10/src/Makefile
@@ -25,7 +25,7 @@ endif
 LDSTATIC=-static
 LIBS=-llshw
 
-DATAFILES = pci.ids usb.ids oui.txt manuf.txt
+DATAFILES = oui.txt manuf.txt
 
 all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)