[dpdk-stable] patch 'crypto/zuc: fix dependency check' has been queued to LTS release 18.11.2

Kevin Traynor ktraynor at redhat.com
Wed May 8 12:15:27 CEST 2019


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 <bruce.richardson at intel.com>
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 <bruce.richardson at intel.com>
---
 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 at 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


More information about the stable mailing list