diff mbox

[dpdk-dev,v6] kernel folder for Linux and BSD modules

Message ID 20180221105609.GA2532@bricha3-MOBL3.ger.corp.intel.com (mailing list archive)
State Not Applicable, archived
Headers

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK

Commit Message

Bruce Richardson Feb. 21, 2018, 10:56 a.m. UTC 
  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 mbox

Patch

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@',