From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by dpdk.org (Postfix) with ESMTP id CBAE63237 for ; Mon, 19 Nov 2018 13:26:13 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id p4so22676565wrt.7 for ; Mon, 19 Nov 2018 04:26:13 -0800 (PST) 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=j67k46r6UNkU34LIf7u76L8d6vSrxWWX03F5PdZubbs=; b=d4VCNEI3xfDhVpZ/yamM/SupP4XqpQNaB3YxwXk32Tp1tk4ZTo7dMD7jQzse1l0NmQ W9Lw4qbDcKxA0zuNFAJ+uO6HvMlI/eIR0pKwqF9VTSOupgwyEojsqly1zUpuusfw6x3g 6oGL8RZPHAl6MmQ/+R58+eP9KwNJdK1auoso3EvRbeWWe4AZJjtMf/Kj0p6/abb3D+cL 5l33nBcu1hBb8+t6l7MiqWbpGw6PU/emo83UnwTv3CFIh3fmLZN7W9hxEYiN4KFuAWlU 1cTjW9Y9eF9BL3ePhQiy7PKS/W5KIHHFK5YgxMz7IClE5bUmch7E0dp6ior8MF6guBRN v7iQ== X-Gm-Message-State: AA+aEWZjORn4FIlLuCrWfq+UGndUBbcRNoiRQIv0V/Km6Zqt6UtiwNas vAsgw91JgySCdNkg1yQW6cI= X-Google-Smtp-Source: AFSGD/WhUMHiw718HHQHn2ZIqb/vycArhmHEPVCD1z7zZnsV0UeAg6uoG6mJPj5hqyvNsObZ9ZxUwg== X-Received: by 2002:adf:db51:: with SMTP id f17mr5441688wrj.90.1542630373516; Mon, 19 Nov 2018 04:26:13 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id n9sm10041391wrx.80.2018.11.19.04.26.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Nov 2018 04:26:12 -0800 (PST) From: Luca Boccassi To: Anatoly Burakov Cc: Rami Rosen , dpdk stable Date: Mon, 19 Nov 2018 12:25:36 +0000 Message-Id: <20181119122538.14207-19-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119122538.14207-1-bluca@debian.org> References: <20181108180111.25873-1-bluca@debian.org> <20181119122538.14207-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'usertools: check for lspci dependency' has been queued to LTS release 16.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: , X-List-Received-Date: Mon, 19 Nov 2018 12:26:14 -0000 Hi, FYI, your patch has been queued to LTS release 16.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 11/21/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Luca Boccassi --- >>From 99fae471198a9e8d87de41b9b82e7ba6b709e27e Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Tue, 13 Nov 2018 16:06:26 +0000 Subject: [PATCH] usertools: check for lspci dependency [ upstream commit 1a5a9cb32a93da47fa6aa0da8407337feaf901f8 ] On some distributions (such as CentOS 7) lspci may not be installed by default, causing exceptions which are difficult to interpret. Fix devbind script to check if lspci is installed at script startup. Signed-off-by: Anatoly Burakov Reviewed-by: Rami Rosen --- tools/dpdk-devbind.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/dpdk-devbind.py b/tools/dpdk-devbind.py index e7cfcd02a..47597deee 100755 --- a/tools/dpdk-devbind.py +++ b/tools/dpdk-devbind.py @@ -609,6 +609,13 @@ def do_arg_actions(): def main(): '''program main function''' + # check if lspci is installed, suppress any output + with open(os.devnull, 'w') as devnull: + ret = subprocess.call(['which', 'lspci'], + stdout=devnull, stderr=devnull) + if ret != 0: + print("'lspci' not found - please install 'pciutils'") + sys.exit(1) parse_args() check_modules() get_nic_details() -- 2.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-19 12:15:18.505158158 +0000 +++ 0019-usertools-check-for-lspci-dependency.patch 2018-11-19 12:15:18.123611432 +0000 @@ -1,26 +1,26 @@ -From 1a5a9cb32a93da47fa6aa0da8407337feaf901f8 Mon Sep 17 00:00:00 2001 +From 99fae471198a9e8d87de41b9b82e7ba6b709e27e Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Tue, 13 Nov 2018 16:06:26 +0000 Subject: [PATCH] usertools: check for lspci dependency +[ upstream commit 1a5a9cb32a93da47fa6aa0da8407337feaf901f8 ] + On some distributions (such as CentOS 7) lspci may not be installed by default, causing exceptions which are difficult to interpret. Fix devbind script to check if lspci is installed at script startup. -Cc: stable@dpdk.org - Signed-off-by: Anatoly Burakov Reviewed-by: Rami Rosen --- - usertools/dpdk-devbind.py | 7 +++++++ + tools/dpdk-devbind.py | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py -index 7d564634c..40dc28a7d 100755 ---- a/usertools/dpdk-devbind.py -+++ b/usertools/dpdk-devbind.py -@@ -655,6 +655,13 @@ def do_arg_actions(): +diff --git a/tools/dpdk-devbind.py b/tools/dpdk-devbind.py +index e7cfcd02a..47597deee 100755 +--- a/tools/dpdk-devbind.py ++++ b/tools/dpdk-devbind.py +@@ -609,6 +609,13 @@ def do_arg_actions(): def main(): '''program main function''' @@ -33,7 +33,7 @@ + sys.exit(1) parse_args() check_modules() - clear_data() + get_nic_details() -- 2.19.1