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 8487AA0093 for ; Tue, 19 May 2020 15:12:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7BB471D702; Tue, 19 May 2020 15:12:24 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by dpdk.org (Postfix) with ESMTP id 22E361D731 for ; Tue, 19 May 2020 15:12:23 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id i15so15802241wrx.10 for ; Tue, 19 May 2020 06:12:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pyrNM7PRhPNjPYeM1u/K65NbroTozCgQGNvphh0aRfc=; b=thfl4+gLeAzZLCvyRg74F8l2nQhH+NTrmOSGSQ6Q5Gqyn9GWJK/8sPFJkmvOKTpyP7 tTyJdwIBdYveSUD+92KI0BxP1VO32sIk2AybvUYbR/rJxcTWOQcaT8Ft9/gen/+YJZe2 XB19ffY5VuSsDdNfE4bxjDOA8NYtJfKPufFxgLK0VqweCoc+EdEhOEc4y1m9WSDfM537 mcvocCATpJEqleUfaW0H88PuLiZBlVRVg/smFuq6eh7BqjK+71QJsSg8PbAp3W2jvauh cWpM1/4K9POgVS6yCLiqs/RNX9LXCWpEf4+if79B2Hr5LS0I9rHT9AgIKYLRvwhR5+ww 8RvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pyrNM7PRhPNjPYeM1u/K65NbroTozCgQGNvphh0aRfc=; b=Ec/DDAHFnTmW60az59tsWW0ikkwVsT+va2l/wH1RW35D97ZXeBsV01eCb4Vh1X5KD8 1XWrQIJ67A8mYcsVwipskDzgxYggDiHX2iF2wjnF7bztq5BxNaaDDW+Te6jZVVv4UT2b qyfDg9X25mEkm4jV1kswY4SfSDMUzcJc7tNBTHCElDb1aOTYmDv+aVq08wapT1m6gckP PkMJGaakZHNGiI8+N5fFykCF9CvSSoNDUK4saqq3KZDmDOWO5ZtviVXtDTA05yw9Of9r yxSn4r5I3zZH2ld2Kso0IEDpNFmDRJIgfIcsy4rZiqbQ1VZQmLwPNbbMuXJw9FL62sa5 bDwQ== X-Gm-Message-State: AOAM5309PpzH1IE+6kd6QIzhD7asm2EbMN1qMHucO7bmwiARzD4BxfFs +lmfkbIq76xsx/bDIxiFkkQ= X-Google-Smtp-Source: ABdhPJwVodnte43B8uE+WEmc4qwz139uaFU4QBv3ZeE6SHB/UM2SWGBC67qbIMk4VCCscKXaXkU+lg== X-Received: by 2002:adf:82c1:: with SMTP id 59mr24721329wrc.377.1589893942877; Tue, 19 May 2020 06:12:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d4sm14909703wre.22.2020.05.19.06.12.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:12:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: David Marchand , dpdk stable Date: Tue, 19 May 2020 14:04:19 +0100 Message-Id: <20200519130549.112823-124-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'usertools: check for pci.ids in /usr/share/misc' has been queued to stable release 19.11.3 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 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 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 @@ -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 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@dpdk.org - Signed-off-by: Luca Boccassi Acked-by: David Marchand ---