[dpdk-stable] patch 'net/nfp: disable in FreeBSD build with meson' has been queued to stable release 18.08.1

[Kevin Traynor]

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 1cf336bf2b208e232228cfc690e3f1fe165ce7dc Mon Sep 17 00:00:00 2001
From: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan at intel.com>
Date: Thu, 4 Oct 2018 15:09:59 +0100
Subject: [PATCH] net/nfp: disable in FreeBSD build with meson

[ upstream commit e60a1a8ba5dd48a2b1ff19833c06baa7b6fd0e17 ]

Disabled nfp build in FreeBSD because it is not supported
Added changes to enable NFP build if it is Linux OS and
disable in FreeBSD.

Fixes: d9b9ca7e0595 ("net/nfp: add to meson build")

Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan at intel.com>
---
 drivers/net/nfp/meson.build | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 3ba37e279..a8f29f986 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -2,4 +2,7 @@
 # Copyright(c) 2018 Intel Corporation
 
+if host_machine.system() != 'linux'
+        build = false
+endif
 sources = files('nfpcore/nfp_cpp_pcie_ops.c',
 	'nfpcore/nfp_nsp.c',
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-22 16:47:33.919580296 +0000
+++ 0063-net-nfp-disable-in-FreeBSD-build-with-meson.patch	2018-11-22 16:47:32.000000000 +0000
@@ -1,14 +1,15 @@
-From e60a1a8ba5dd48a2b1ff19833c06baa7b6fd0e17 Mon Sep 17 00:00:00 2001
+From 1cf336bf2b208e232228cfc690e3f1fe165ce7dc Mon Sep 17 00:00:00 2001
 From: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan at intel.com>
 Date: Thu, 4 Oct 2018 15:09:59 +0100
 Subject: [PATCH] net/nfp: disable in FreeBSD build with meson
 
+[ upstream commit e60a1a8ba5dd48a2b1ff19833c06baa7b6fd0e17 ]
+
 Disabled nfp build in FreeBSD because it is not supported
 Added changes to enable NFP build if it is Linux OS and
 disable in FreeBSD.
 
 Fixes: d9b9ca7e0595 ("net/nfp: add to meson build")
-Cc: stable at dpdk.org
 
 Signed-off-by: Agalya Babu RadhaKrishnan <agalyax.babu.radhakrishnan at intel.com>
 ---