[dpdk-stable] patch 'usertools: check for pci.ids in /usr/share/misc' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 35348ca71ef7dca4513fe2d95ed1e78a4ce82927 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi at microsoft.com>
Date: Thu, 12 Mar 2020 16:30:27 +0000
Subject: [PATCH] usertools: check for pci.ids in /usr/share/misc

[ upstream commit 2ad9f1fab883dd4e5ebad7a912f9258cc9f3fbb9 ]

Debian and Ubuntu switched years ago from /usr/share/hwdata to
/usr/share/misc, and the former is just a compat symlink now.
We are starting to get bug reports to nudge us into changing.
So check the new path first, and the old one as a fallback.

Signed-off-by: Luca Boccassi <luca.boccassi at microsoft.com>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 usertools/dpdk-pmdinfo.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/usertools/dpdk-pmdinfo.py b/usertools/dpdk-pmdinfo.py
index 9d5c6369a0..12f20735e0 100755
--- a/usertools/dpdk-pmdinfo.py
+++ b/usertools/dpdk-pmdinfo.py
@@ -561,7 +561,10 @@ def main(stream=None):
 
     pcifile_default = "./pci.ids"  # For unknown OS's assume local file
     if platform.system() == 'Linux':
-        pcifile_default = "/usr/share/hwdata/pci.ids"
+        # hwdata is the legacy location, misc is supported going forward
+        pcifile_default = "/usr/share/misc/pci.ids"
+        if not os.path.exists(pcifile_default):
+            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):
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:49.546168639 +0100
+++ 0124-usertools-check-for-pci.ids-in-usr-share-misc.patch	2020-05-19 14:04:44.432652287 +0100
@@ -1,15 +1,15 @@
-From 2ad9f1fab883dd4e5ebad7a912f9258cc9f3fbb9 Mon Sep 17 00:00:00 2001
+From 35348ca71ef7dca4513fe2d95ed1e78a4ce82927 Mon Sep 17 00:00:00 2001
 From: Luca Boccassi <luca.boccassi at microsoft.com>
 Date: Thu, 12 Mar 2020 16:30:27 +0000
 Subject: [PATCH] usertools: check for pci.ids in /usr/share/misc
 
+[ upstream commit 2ad9f1fab883dd4e5ebad7a912f9258cc9f3fbb9 ]
+
 Debian and Ubuntu switched years ago from /usr/share/hwdata to
 /usr/share/misc, and the former is just a compat symlink now.
 We are starting to get bug reports to nudge us into changing.
 So check the new path first, and the old one as a fallback.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Luca Boccassi <luca.boccassi at microsoft.com>
 Acked-by: David Marchand <david.marchand at redhat.com>
 ---