From: Xiaolong Ye <xiaolong.ye@intel.com> To: Ferruh Yigit <ferruh.yigit@intel.com>, Bruce Richardson <bruce.richardson@intel.com> Cc: dev@dpdk.org, Xiaolong Ye <xiaolong.ye@intel.com>, stable@dpdk.org, iryzhov@nfware.com Subject: [dpdk-dev] [PATCH v2] kernel/linux: fix kernel dir for meson Date: Tue, 3 Dec 2019 13:29:17 +0800 Message-ID: <20191203052917.19820-1-xiaolong.ye@intel.com> (raw) In-Reply-To: <20191202061442.56964-1-xiaolong.ye@intel.com> kernel_dir option in meson build is equivalent to RTE_KERNELDIR in make system, for cross-compilation case, users would specify it as local kernel src dir like /<user local dir>/target-arm_glibc/linux-arm/linux-4.19.81/ Current meson build would fail to compile kernel module if user specify kernel_dir as above, this patch fixes this issue. Fixes: 317832f97c16 ("kernel/linux: fix modules install path") Cc: stable@dpdk.org Cc: iryzhov@nfware.com Signed-off-by: Xiaolong Ye <xiaolong.ye@intel.com> --- V2 changes: 1. handle both normal and cross-compilation cases kernel/linux/igb_uio/meson.build | 4 ++-- kernel/linux/kni/meson.build | 4 ++-- kernel/linux/meson.build | 11 +++++++++-- meson_options.txt | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build index fac404f07..63990372e 100644 --- a/kernel/linux/igb_uio/meson.build +++ b/kernel/linux/igb_uio/meson.build @@ -8,7 +8,7 @@ mkfile = custom_target('igb_uio_makefile', custom_target('igb_uio', input: ['igb_uio.c', 'Kbuild'], output: 'igb_uio.ko', - command: ['make', '-C', kernel_dir + '/build', + command: ['make', '-C', kernel_dir, 'M=' + meson.current_build_dir(), 'src=' + meson.current_source_dir(), 'EXTRA_CFLAGS=-I' + meson.current_source_dir() + @@ -16,5 +16,5 @@ custom_target('igb_uio', 'modules'], depends: mkfile, install: true, - install_dir: kernel_dir + '/extra/dpdk', + install_dir: install_base + '/extra/dpdk', build_by_default: get_option('enable_kmods')) diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build index 955eec949..04c817e8a 100644 --- a/kernel/linux/kni/meson.build +++ b/kernel/linux/kni/meson.build @@ -13,7 +13,7 @@ kni_sources = files( custom_target('rte_kni', input: kni_sources, output: 'rte_kni.ko', - command: ['make', '-j4', '-C', kernel_dir + '/build', + command: ['make', '-j4', '-C', kernel_dir, 'M=' + meson.current_build_dir(), 'src=' + meson.current_source_dir(), 'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' + @@ -25,5 +25,5 @@ custom_target('rte_kni', depends: kni_mkfile, console: true, install: true, - install_dir: kernel_dir + '/extra/dpdk', + install_dir: install_base + '/extra/dpdk', build_by_default: get_option('enable_kmods')) diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index 1796cc686..db50f79fe 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -13,17 +13,24 @@ kernel_dir = get_option('kernel_dir') if kernel_dir == '' # use default path for native builds kernel_version = run_command('uname', '-r').stdout().strip() - kernel_dir = '/lib/modules/' + kernel_version + kernel_dir = '/lib/modules/' + kernel_version + '/build' endif # test running make in kernel directory, using "make kernelversion" -make_returncode = run_command('make', '-sC', kernel_dir + '/build', +make_returncode = run_command('make', '-sC', kernel_dir, 'kernelversion').returncode() if make_returncode != 0 warning('Cannot compile kernel modules as requested - are kernel headers installed?') subdir_done() endif +if kernel_dir.endswith('build') + install_base = kernel_dir.split('build')[0] +else + install_base = kernel_dir +endif + + # DO ACTUAL MODULE BUILDING foreach d:subdirs subdir(d) diff --git a/meson_options.txt b/meson_options.txt index bc369d06c..7eba3b720 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -17,7 +17,7 @@ option('ibverbs_link', type: 'combo', choices : ['shared', 'dlopen'], value: 'sh option('include_subdir_arch', type: 'string', value: '', description: 'subdirectory where to install arch-dependent headers') option('kernel_dir', type: 'string', value: '', - 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.') + description: 'Path to the kernel for building kernel modules. Modules will be installed in $DEST_DIR/$kernel_dir/extra/dpdk.') option('lib_musdk_dir', type: 'string', value: '', description: 'path to the MUSDK library installation directory') option('machine', type: 'string', value: 'native', -- 2.17.1
next prev parent reply index Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-02 6:14 [dpdk-dev] [PATCH] " Xiaolong Ye 2019-12-02 8:10 ` Igor Ryzhov 2019-12-02 8:39 ` Ye Xiaolong 2019-12-02 9:16 ` Igor Ryzhov 2019-12-02 11:34 ` Ye Xiaolong 2019-12-02 12:08 ` Bruce Richardson 2019-12-02 15:44 ` Ye Xiaolong 2019-12-03 5:33 ` Ye Xiaolong 2019-12-03 10:10 ` Bruce Richardson 2019-12-03 5:29 ` Xiaolong Ye [this message] 2019-12-03 10:11 ` [dpdk-dev] [PATCH v2] " Bruce Richardson 2019-12-03 12:33 ` Ye Xiaolong 2019-12-03 13:58 ` Bruce Richardson 2019-12-03 15:01 ` Ye Xiaolong 2019-12-03 15:59 ` [dpdk-dev] [PATCH v3] " Xiaolong Ye 2019-12-04 13:51 ` Luca Boccassi 2019-12-04 14:18 ` Ye Xiaolong 2019-12-04 15:12 ` Bruce Richardson 2019-12-08 1:26 ` Ye Xiaolong 2019-12-09 12:12 ` Bruce Richardson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191203052917.19820-1-xiaolong.ye@intel.com \ --to=xiaolong.ye@intel.com \ --cc=bruce.richardson@intel.com \ --cc=dev@dpdk.org \ --cc=ferruh.yigit@intel.com \ --cc=iryzhov@nfware.com \ --cc=stable@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK-dev Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/dpdk-dev/0 dpdk-dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dpdk-dev dpdk-dev/ https://lore.kernel.org/dpdk-dev \ dev@dpdk.org public-inbox-index dpdk-dev Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git