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 A9E4AA0096 for ; Wed, 8 May 2019 12:17:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9BCB537B7; Wed, 8 May 2019 12:17:04 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 257724C95 for ; Wed, 8 May 2019 12:17:02 +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 8C884302451A; Wed, 8 May 2019 10:17:01 +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 CF36118506; Wed, 8 May 2019 10:17:00 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: dpdk stable Date: Wed, 8 May 2019 11:15:27 +0100 Message-Id: <20190508101534.8984-45-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.49]); Wed, 08 May 2019 10:17:01 +0000 (UTC) Subject: [dpdk-stable] patch 'crypto/zuc: 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/e13b2e6963bea7c13840e34a526a0245daad91f3 Thanks. Kevin Traynor --- >From e13b2e6963bea7c13840e34a526a0245daad91f3 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 1 May 2019 16:53:29 +0100 Subject: [PATCH] crypto/zuc: fix dependency check [ upstream commit d0246e0fdc8fd8eeb43f1b0f28330516bdff31eb ] The check for the zuc 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: df1740a8db5f ("crypto/zuc: enable meson build") Signed-off-by: Bruce Richardson --- drivers/crypto/zuc/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/zuc/meson.build b/drivers/crypto/zuc/meson.build index b8ca7107e..2b48072c6 100644 --- a/drivers/crypto/zuc/meson.build +++ b/drivers/crypto/zuc/meson.build @@ -2,11 +2,11 @@ # Copyright(c) 2018 Intel Corporation -lib = cc.find_library('libsso_zuc', required: false) -if not lib.found() +lib = cc.find_library('sso_zuc', required: false) +if not lib.found() or not cc.has_header('sso_zuc.h') build = false -else - ext_deps += lib + subdir_done() endif +ext_deps += lib sources = files('rte_zuc_pmd.c', 'rte_zuc_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.057105236 +0100 +++ 0045-crypto-zuc-fix-dependency-check.patch 2019-05-08 11:05:05.852932280 +0100 @@ -1 +1 @@ -From d0246e0fdc8fd8eeb43f1b0f28330516bdff31eb Mon Sep 17 00:00:00 2001 +From e13b2e6963bea7c13840e34a526a0245daad91f3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d0246e0fdc8fd8eeb43f1b0f28330516bdff31eb ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 63f2a5298..fc2900244 100644 +index b8ca7107e..2b48072c6 100644 @@ -22 +23 @@ -@@ -2,12 +2,12 @@ +@@ -2,11 +2,11 @@ @@ -35 +35,0 @@ - allow_experimental_apis = true