From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 527611B49D for ; Thu, 22 Nov 2018 17:53:34 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B1EA22D80F; Thu, 22 Nov 2018 16:53:33 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC2AE17A67; Thu, 22 Nov 2018 16:53:32 +0000 (UTC) From: Kevin Traynor To: Agalya Babu RadhaKrishnan Cc: Jasvinder Singh , dpdk stable Date: Thu, 22 Nov 2018 16:49:57 +0000 Message-Id: <20181122164957.13003-65-ktraynor@redhat.com> In-Reply-To: <20181122164957.13003-1-ktraynor@redhat.com> References: <20181122164957.13003-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 22 Nov 2018 16:53:33 +0000 (UTC) Subject: [dpdk-stable] patch 'net/softnic: disable in FreeBSD build with meson' has been queued to stable release 18.08.1 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, 22 Nov 2018 16:53:34 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/28/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. Kevin Traynor --- >>From 1071becb379cbe6fdf687bb9e0cc805aab724628 Mon Sep 17 00:00:00 2001 From: Agalya Babu RadhaKrishnan Date: Thu, 4 Oct 2018 15:10:01 +0100 Subject: [PATCH] net/softnic: disable in FreeBSD build with meson [ upstream commit ddb05fec8c4cfadf5e5496b0919e78a7d7038799 ] Disabled softnic build in FreeBSD because it is not supported Added changes to enable softnic build if it is Linux OS and disable in FreeBSD. Fixes: 6b2a3900e2fb ("net/softnic: add to meson build") Signed-off-by: Agalya Babu RadhaKrishnan Acked-by: Jasvinder Singh --- drivers/net/softnic/meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build index ff9822747..673d2cee8 100644 --- a/drivers/net/softnic/meson.build +++ b/drivers/net/softnic/meson.build @@ -2,4 +2,7 @@ # Copyright(c) 2018 Intel Corporation +if host_machine.system() != 'linux' + build = false +endif allow_experimental_apis = true install_headers('rte_eth_softnic.h') -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-22 16:47:33.967404698 +0000 +++ 0065-net-softnic-disable-in-FreeBSD-build-with-meson.patch 2018-11-22 16:47:32.000000000 +0000 @@ -1,14 +1,15 @@ -From ddb05fec8c4cfadf5e5496b0919e78a7d7038799 Mon Sep 17 00:00:00 2001 +From 1071becb379cbe6fdf687bb9e0cc805aab724628 Mon Sep 17 00:00:00 2001 From: Agalya Babu RadhaKrishnan Date: Thu, 4 Oct 2018 15:10:01 +0100 Subject: [PATCH] net/softnic: disable in FreeBSD build with meson +[ upstream commit ddb05fec8c4cfadf5e5496b0919e78a7d7038799 ] + Disabled softnic build in FreeBSD because it is not supported Added changes to enable softnic build if it is Linux OS and disable in FreeBSD. Fixes: 6b2a3900e2fb ("net/softnic: add to meson build") -Cc: stable@dpdk.org Signed-off-by: Agalya Babu RadhaKrishnan Acked-by: Jasvinder Singh @@ -17,7 +18,7 @@ 1 file changed, 3 insertions(+) diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build -index a18eef596..da249c068 100644 +index ff9822747..673d2cee8 100644 --- a/drivers/net/softnic/meson.build +++ b/drivers/net/softnic/meson.build @@ -2,4 +2,7 @@