summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2016-07-08 21:37:05 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2016-07-10 14:51:09 +0200
commit139bdc1db6618985a9468a937d78e6c5982712dd (patch)
treebfae0ba7b496b59268ee7b8dddd19f6ebfec7b4d /tools
parent6a4f87f1e76db2633ea237521fe5af9c657a6cd2 (diff)
downloaddpdk-139bdc1db6618985a9468a937d78e6c5982712dd.zip
dpdk-139bdc1db6618985a9468a937d78e6c5982712dd.tar.gz
dpdk-139bdc1db6618985a9468a937d78e6c5982712dd.tar.xz
tools: fix pmdinfo for FreeBSD
There were a couple of issues which prevented pmdinfo.py from running on FreeBSD, both of which are fixed by this patch. * The path to python is not /usr/bin/python as on Linux, so use /usr/bin/env to find it on both OS's. * The path to the pci ids DB is in a different location on FreeBSD, so use the platform python library to look in different default locations depending on the underlying OS. [There are two possible locations to look on FreeBSD, as defined by pciconf manpage, so check in both in order of better to worse] Fixes: c67c9a5c646a ("tools: query binaries for HW and other support information") Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/pmdinfo.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/tools/pmdinfo.py b/tools/pmdinfo.py
index e531154..662034a 100755
--- a/tools/pmdinfo.py
+++ b/tools/pmdinfo.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
# -------------------------------------------------------------------------
# scripts/pmdinfo.py
#
@@ -10,6 +10,7 @@ import sys
from optparse import OptionParser
import string
import json
+import platform
# For running from development directory. It should take precedence over the
# installed pyelftools.
@@ -557,6 +558,14 @@ def main(stream=None):
global raw_output
global pcidb
+ pcifile_default = "./pci.ids" # for unknown OS's assume local file
+ if platform.system() == 'Linux':
+ pcifile_default = "/usr/share/hwdata/pci.ids"
+ elif platform.system() == 'FreeBSD':
+ pcifile_default = "/usr/local/share/pciids/pci.ids"
+ if not os.path.exists(pcifile_default):
+ pcifile_default = "/usr/share/misc/pci_vendors"
+
optparser = OptionParser(
usage='usage: %prog [-hrtp] [-d <pci id file] <elf-file>',
description="Dump pmd hardware support info",
@@ -568,7 +577,7 @@ def main(stream=None):
optparser.add_option("-d", "--pcidb", dest="pcifile",
help="specify a pci database "
"to get vendor names from",
- default="/usr/share/hwdata/pci.ids", metavar="FILE")
+ default=pcifile_default, metavar="FILE")
optparser.add_option("-t", "--table", dest="tblout",
help="output information on hw support as a hex table",
action='store_true')