From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 346251B512 for ; Fri, 30 Nov 2018 00:15:56 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:21:48 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW8w032075; Fri, 30 Nov 2018 01:15:53 +0200 From: Yongseok Koh To: Anatoly Burakov Cc: Rami Rosen , dpdk stable Date: Thu, 29 Nov 2018 15:11:52 -0800 Message-Id: <20181129231202.30436-118-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'usertools: check for lspci dependency' has been queued to LTS release 17.11.5 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: Thu, 29 Nov 2018 23:15:56 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/01/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. Yongseok --- >>From b3608bc279d1c2978f6f766d74bdadcabe96afae 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 --- usertools/dpdk-devbind.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py index df9b21a6d..05711fdc3 100755 --- a/usertools/dpdk-devbind.py +++ b/usertools/dpdk-devbind.py @@ -705,6 +705,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() clear_data() -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:50.366528826 -0800 +++ 0118-usertools-check-for-lspci-dependency.patch 2018-11-29 15:01:45.313959000 -0800 @@ -1,15 +1,15 @@ -From 1a5a9cb32a93da47fa6aa0da8407337feaf901f8 Mon Sep 17 00:00:00 2001 +From b3608bc279d1c2978f6f766d74bdadcabe96afae 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 --- @@ -17,10 +17,10 @@ 1 file changed, 7 insertions(+) diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py -index 7d564634c..40dc28a7d 100755 +index df9b21a6d..05711fdc3 100755 --- a/usertools/dpdk-devbind.py +++ b/usertools/dpdk-devbind.py -@@ -655,6 +655,13 @@ def do_arg_actions(): +@@ -705,6 +705,13 @@ def do_arg_actions(): def main(): '''program main function'''