From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6BB43A04B5; Tue, 3 Dec 2019 17:03:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A8C62B8D; Tue, 3 Dec 2019 17:03:39 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 53D961F5; Tue, 3 Dec 2019 17:03:38 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Dec 2019 08:03:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,273,1571727600"; d="scan'208";a="361237006" Received: from yexl-server.sh.intel.com ([10.67.117.17]) by orsmga004.jf.intel.com with ESMTP; 03 Dec 2019 08:03:35 -0800 From: Xiaolong Ye To: Ferruh Yigit , Bruce Richardson Cc: dev@dpdk.org, Xiaolong Ye , stable@dpdk.org, iryzhov@nfware.com Date: Tue, 3 Dec 2019 23:59:22 +0800 Message-Id: <20191203155922.1565-1-xiaolong.ye@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191202061442.56964-1-xiaolong.ye@intel.com> References: <20191202061442.56964-1-xiaolong.ye@intel.com> Subject: [dpdk-dev] [PATCH v3] kernel/linux: fix kernel dir for meson X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 //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. After this change, for normal build case, user can specify /lib/modules/ or /lib/modules//build as kernel_dir. For cross compilation case, user can specify any directory that contains kernel source code as the kernel_dir. Fixes: 317832f97c16 ("kernel/linux: fix modules install path") Cc: stable@dpdk.org Cc: iryzhov@nfware.com Signed-off-by: Xiaolong Ye --- V3 changes: 1. support setting both /lib/modules/ and /lib/modules//build as kernel_dir to keep backward compatibility 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 | 19 +++++++++++++++---- meson_options.txt | 2 +- 4 files changed, 20 insertions(+), 9 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..0568ed7e1 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -13,15 +13,26 @@ 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() + kernel_dir = 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 +endif + +if kernel_dir.endswith('build') or kernel_dir.endswith('build/') + install_base = kernel_dir.split('build')[0] +else + install_base = kernel_dir endif # DO ACTUAL MODULE BUILDING 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