From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 807E9A0093 for ; Thu, 28 May 2020 18:26:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 772941DC20; Thu, 28 May 2020 18:26:36 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 761531DC29 for ; Thu, 28 May 2020 18:26:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aMsUjsdGXidUWCYTlXr6JtwL6jOYZe9OX3cxx14H1u0=; b=HVYj0Difh9aO0vGOJpB2e7wJ5L98AmLjgqfSO0FkpKpMr5cG50Tcw1tB9v8+N1TSkB4+sv XCFyXz0G4etzBcR86vt20OTXsOA3ofndXRDwBtF7QPem/kGi5K4lEDlc2S3gMUI8WY54qx hovjfgqC+DK8AZMl+P9CLkG0SeyE+AY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-419-gRp3hBmAOQO7gLojAacsoQ-1; Thu, 28 May 2020 12:26:30 -0400 X-MC-Unique: gRp3hBmAOQO7gLojAacsoQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14B9518FE863; Thu, 28 May 2020 16:26:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B73160C05; Thu, 28 May 2020 16:26:22 +0000 (UTC) From: Kevin Traynor To: Luca Boccassi Cc: David Marchand , dpdk stable Date: Thu, 28 May 2020 17:23:21 +0100 Message-Id: <20200528162322.7863-94-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'usertools: check for pci.ids in /usr/share/misc' has been queued to LTS release 18.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/2d4d0ff26a13eee7c43f1a5bf45d3b517fd6fd06 Thanks. Kevin. --- >From 2d4d0ff26a13eee7c43f1a5bf45d3b517fd6fd06 Mon Sep 17 00:00:00 2001 From: Luca Boccassi 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 Acked-by: David Marchand --- 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 @@ -562,5 +562,8 @@ 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" -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:04.007676685 +0100 +++ 0094-usertools-check-for-pci.ids-in-usr-share-misc.patch 2020-05-28 17:12:59.215553821 +0100 @@ -1 +1 @@ -From 2ad9f1fab883dd4e5ebad7a912f9258cc9f3fbb9 Mon Sep 17 00:00:00 2001 +From 2d4d0ff26a13eee7c43f1a5bf45d3b517fd6fd06 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2ad9f1fab883dd4e5ebad7a912f9258cc9f3fbb9 ] + @@ -10,2 +11,0 @@ - -Cc: stable@dpdk.org