From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 93105A0096 for ; Wed, 8 May 2019 12:17:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 86758493D; Wed, 8 May 2019 12:17:02 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 048AF34F0 for ; Wed, 8 May 2019 12:17:01 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E8B4CA1FF; Wed, 8 May 2019 10:17:00 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id B00C0410E; Wed, 8 May 2019 10:16:59 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: dpdk stable Date: Wed, 8 May 2019 11:15:26 +0100 Message-Id: <20190508101534.8984-44-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 08 May 2019 10:17:00 +0000 (UTC) Subject: [dpdk-stable] patch 'crypto/kasumi: fix dependency check' has been queued to LTS release 18.11.2 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.2 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/13/19. 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/8ec3ea45d73239f05f00bb70730352766159e2dd Thanks. Kevin Traynor --- >From 8ec3ea45d73239f05f00bb70730352766159e2dd Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 1 May 2019 16:53:28 +0100 Subject: [PATCH] crypto/kasumi: fix dependency check [ upstream commit 408bb7b07becf6002e92982888e020734c1f0241 ] The check for the kasumi library dependency did not check for the include file needed for compilation. It's also recommended when looking for a library to use the name without the lib prefix. Fixes: 2ec2d46c6255 ("crypto/kasumi: enable meson build") Signed-off-by: Bruce Richardson --- drivers/crypto/kasumi/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/kasumi/meson.build b/drivers/crypto/kasumi/meson.build index a09b0e251..9a8956a03 100644 --- a/drivers/crypto/kasumi/meson.build +++ b/drivers/crypto/kasumi/meson.build @@ -2,11 +2,11 @@ # Copyright(c) 2018 Intel Corporation -lib = cc.find_library('libsso_kasumi', required: false) -if not lib.found() +lib = cc.find_library('sso_kasumi', required: false) +if not lib.found() or not cc.has_header('sso_kasumi.h') build = false -else - ext_deps += lib + subdir_done() endif +ext_deps += lib sources = files('rte_kasumi_pmd.c', 'rte_kasumi_pmd_ops.c') deps += ['bus_vdev'] -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:08.009533142 +0100 +++ 0044-crypto-kasumi-fix-dependency-check.patch 2019-05-08 11:05:05.852932280 +0100 @@ -1 +1 @@ -From 408bb7b07becf6002e92982888e020734c1f0241 Mon Sep 17 00:00:00 2001 +From 8ec3ea45d73239f05f00bb70730352766159e2dd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 408bb7b07becf6002e92982888e020734c1f0241 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 80f13cd24..0fa301740 100644 +index a09b0e251..9a8956a03 100644 @@ -22 +23 @@ -@@ -2,12 +2,12 @@ +@@ -2,11 +2,11 @@ @@ -35 +35,0 @@ - allow_experimental_apis = true