From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bruce Richardson <bruce.richardson@intel.com>
Subject: Re: [PATCH v6] kernel folder for Linux and BSD modules
Date: Wed, 21 Feb 2018 10:56:10 +0000
Message-ID: <20180221105609.GA2532@bricha3-MOBL3.ger.corp.intel.com>
References: <1515769212-24122-1-git-send-email-hemant.agrawal@nxp.com>
 <1519200571-12620-1-git-send-email-hemant.agrawal@nxp.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: dev@dpdk.org, thomas@monjalon.net
To: Hemant Agrawal <hemant.agrawal@nxp.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by dpdk.org (Postfix) with ESMTP id D1D331B1AD
 for <dev@dpdk.org>; Wed, 21 Feb 2018 11:56:15 +0100 (CET)
Content-Disposition: inline
In-Reply-To: <1519200571-12620-1-git-send-email-hemant.agrawal@nxp.com>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

On Wed, Feb 21, 2018 at 01:39:31PM +0530, Hemant Agrawal wrote:
> This patch moves the kernel modules code from EAL to a common place.
>  - Separate the kernel module code from user space code.
> 
> Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> Tested-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> v6: added meson build support
> v5: rearrange kernel compliation as per Bruce's suggestion
> v4: update the path in MAINTAINERS
> v3: move contigmem from bsdapp
> v2: rename kern to kernel, add freebsd modules as well
> 
Hi Hemant,

from testing on FreeBSD, I believe these are the changes needed to allow
compilation with meson there. Nothing too drastic - mainly fix up the
folder names, and skip the subdir into the higher-level "freebsd" folder.

/Bruce

diff --git a/kernel/meson.build b/kernel/meson.build
index a5d5df7dd..697c419b6 100644
--- a/kernel/meson.build
+++ b/kernel/meson.build
@@ -13,7 +13,6 @@ if host_machine.system() == 'linux'

 elif host_machine.system() == 'freebsd'
        dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1)
-       subdir('freebsd')
        kmods = ['contigmem', 'nic_uio']

        # for building kernel modules, we use kernel build system using make, as
@@ -26,9 +25,9 @@ elif host_machine.system() == 'freebsd'
                        '-I' + join_paths(meson.source_root(), 'config'),
                        '-include rte_config.h']
        foreach k:kmods
-               subdir(join_paths('bsdapp', k))
+               subdir(join_paths('freebsd', k))
                custom_target(k,
-                       input: [files('bsdapp/BSDmakefile.meson'), sources],
+                       input: [files('freebsd/BSDmakefile.meson'), sources],
                        output: k + '.ko',
                        command: ['make', '-f', '@INPUT0@',
                                'KMOD_SRC=@INPUT1@',