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 7F9E6A0096 for ; Wed, 8 May 2019 12:17:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 523DE4C93; Wed, 8 May 2019 12:17:01 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E7CA734F0 for ; Wed, 8 May 2019 12:16:59 +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 5E8F485546; Wed, 8 May 2019 10:16:59 +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 85AC98185; Wed, 8 May 2019 10:16:58 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: dpdk stable Date: Wed, 8 May 2019 11:15:25 +0100 Message-Id: <20190508101534.8984-43-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.28]); Wed, 08 May 2019 10:16:59 +0000 (UTC) Subject: [dpdk-stable] patch 'crypto/snow3g: add to meson build' 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/dbe0a4bc399585e8abe09447774a141f07826673 Thanks. Kevin Traynor --- >From dbe0a4bc399585e8abe09447774a141f07826673 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 1 May 2019 16:53:27 +0100 Subject: [PATCH] crypto/snow3g: add to meson build [ upstream commit 1999aeb3689e01c7644fd9c149b892d335a92069 ] Snow3G driver is missing support for building with meson. Add a new meson.build file so it can be included in the builds. Signed-off-by: Bruce Richardson --- drivers/crypto/meson.build | 2 +- drivers/crypto/snow3g/meson.build | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/snow3g/meson.build diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index bf1bd9286..83e78860e 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -4,5 +4,5 @@ drivers = ['aesni_gcm', 'aesni_mb', 'caam_jr', 'ccp', 'dpaa_sec', 'dpaa2_sec', 'kasumi', 'mvsam', 'null', 'octeontx', 'openssl', 'qat', 'scheduler', - 'virtio', 'zuc'] + 'snow3g', 'virtio', 'zuc'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps diff --git a/drivers/crypto/snow3g/meson.build b/drivers/crypto/snow3g/meson.build new file mode 100644 index 000000000..c566a5f67 --- /dev/null +++ b/drivers/crypto/snow3g/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2019 Intel Corporation + +lib = cc.find_library('sso_snow3g', required: false) +if not lib.found() or not cc.has_header('sso_snow3g.h') + build = false + subdir_done() +endif + +allow_experimental_apis = true +ext_deps += lib +sources = files('rte_snow3g_pmd.c', 'rte_snow3g_pmd_ops.c') +deps += ['bus_vdev', 'cryptodev'] -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:07.965461874 +0100 +++ 0043-crypto-snow3g-add-to-meson-build.patch 2019-05-08 11:05:05.852932280 +0100 @@ -1 +1 @@ -From 1999aeb3689e01c7644fd9c149b892d335a92069 Mon Sep 17 00:00:00 2001 +From dbe0a4bc399585e8abe09447774a141f07826673 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1999aeb3689e01c7644fd9c149b892d335a92069 ] + @@ -8,2 +9,0 @@ - -Cc: stable@dpdk.org