d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kernel/linux: fix modules install path

Browse Source 
Currently kernel modules are installed into /usr/src instead of
/lib/modules when meson build system is used. This patch fixes that.

Cc: stable@dpdk.org

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Igor Ryzhov 2019-06-11 11:49:34 +03:00 committed by Thomas Monjalon
parent 1c7191e734
commit 317832f97c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/linux/igb_uio/meson.build
View File

@ -8,7 +8,7 @@ mkfile = custom_target('igb_uio_makefile',
custom_target('igb_uio', custom_target('igb_uio',
input: ['igb_uio.c', 'Kbuild'], input: ['igb_uio.c', 'Kbuild'],
output: 'igb_uio.ko', output: 'igb_uio.ko',
command: ['make', '-C', kernel_dir, command: ['make', '-C', kernel_dir + '/build',
'M=' + meson.current_build_dir(), 'M=' + meson.current_build_dir(),
'src=' + meson.current_source_dir(), 'src=' + meson.current_source_dir(),
'EXTRA_CFLAGS=-I' + meson.current_source_dir() + 'EXTRA_CFLAGS=-I' + meson.current_source_dir() +
@ -16,5 +16,5 @@ custom_target('igb_uio',
'modules'], 'modules'],
depends: mkfile, depends: mkfile,
install: true, install: true,
install_dir: kernel_dir + '/../extra/dpdk', install_dir: kernel_dir + '/extra/dpdk',
build_by_default: get_option('enable_kmods')) build_by_default: get_option('enable_kmods'))

4
kernel/linux/kni/meson.build
View File

@ -13,7 +13,7 @@ kni_sources = files(
custom_target('rte_kni', custom_target('rte_kni',
input: kni_sources, input: kni_sources,
output: 'rte_kni.ko', output: 'rte_kni.ko',
command: ['make', '-j4', '-C', kernel_dir, command: ['make', '-j4', '-C', kernel_dir + '/build',
'M=' + meson.current_build_dir(), 'M=' + meson.current_build_dir(),
'src=' + meson.current_source_dir(), 'src=' + meson.current_source_dir(),
'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' + 'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' +
@ -25,5 +25,5 @@ custom_target('rte_kni',
depends: kni_mkfile, depends: kni_mkfile,
console: true, console: true,
install: true, install: true,
install_dir: kernel_dir + '/../extra/dpdk', install_dir: kernel_dir + '/extra/dpdk',
build_by_default: get_option('enable_kmods')) build_by_default: get_option('enable_kmods'))

4
kernel/linux/meson.build
View File

@ -13,11 +13,11 @@ kernel_dir = get_option('kernel_dir')
if kernel_dir == '' if kernel_dir == ''
# use default path for native builds # use default path for native builds
kernel_version = run_command('uname', '-r').stdout().strip() kernel_version = run_command('uname', '-r').stdout().strip()
kernel_dir = '/lib/modules/' + kernel_version + '/build' kernel_dir = '/lib/modules/' + kernel_version
endif endif
# test running make in kernel directory, using "make kernelversion" # test running make in kernel directory, using "make kernelversion"
make_returncode = run_command('make', '-sC', kernel_dir, make_returncode = run_command('make', '-sC', kernel_dir + '/build',
'kernelversion').returncode() 'kernelversion').returncode()
if make_returncode != 0 if make_returncode != 0
warning('Cannot compile kernel modules as requested - are kernel headers installed?') warning('Cannot compile kernel modules as requested - are kernel headers installed?')

2
meson_options.txt
View File

@ -15,7 +15,7 @@ option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'sh
option('include_subdir_arch', type: 'string', value: '', option('include_subdir_arch', type: 'string', value: '',
description: 'subdirectory where to install arch-dependent headers') description: 'subdirectory where to install arch-dependent headers')
option('kernel_dir', type: 'string', value: '', option('kernel_dir', type: 'string', value: '',
description: 'path to the kernel for building kernel modules, they will be installed in $DEST_DIR/$kernel_dir/../extra/dpdk') description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir/build. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.')
option('lib_musdk_dir', type: 'string', value: '', option('lib_musdk_dir', type: 'string', value: '',
description: 'path to the MUSDK library installation directory') description: 'path to the MUSDK library installation directory')
option('machine', type: 'string', value: 'native', option('machine', type: 'string', value: 'native',