From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 1E58C8D9D for ; Fri, 27 Apr 2018 15:49:38 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Apr 2018 06:49:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,335,1520924400"; d="scan'208";a="194881359" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by orsmga004.jf.intel.com with ESMTP; 27 Apr 2018 06:49:37 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: hemant.agrawal@nxp.com, bluca@debian.org, Bruce Richardson Date: Fri, 27 Apr 2018 14:49:26 +0100 Message-Id: <20180427134928.4716-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180427134928.4716-1-bruce.richardson@intel.com> References: <20180418210521.277384-1-bruce.richardson@intel.com> <20180427134928.4716-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 1/3] build: fix kernel compile on cross-build 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: , X-List-Received-Date: Fri, 27 Apr 2018 13:49:39 -0000 When cross-compiling, if no kernel_dir was specified, then the kernel modules were still being compiled for the build machine. Fix this by only building modules on cross-compile when we have a kernel_dir value set. Print out a message indicating why we are skipping kernel compilation, and in case that the headers for kernel compile are not found, print a warning instead of erroring out. Fixes: a52f4574f798 ("igb_uio: build with meson") Signed-off-by: Bruce Richardson --- kernel/linux/igb_uio/meson.build | 6 ------ kernel/linux/meson.build | 40 +++++++++++++++++++++++++++++++++++++--- meson.build | 6 +++++- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/kernel/linux/igb_uio/meson.build b/kernel/linux/igb_uio/meson.build index 356f4ab32..71ed2e7a8 100644 --- a/kernel/linux/igb_uio/meson.build +++ b/kernel/linux/igb_uio/meson.build @@ -1,12 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -kernel_dir = get_option('kernel_dir') -if kernel_dir == '' - kernel_version = run_command('uname', '-r').stdout().strip() - kernel_dir = '/lib/modules/' + kernel_version + '/build' -endif - mkfile = custom_target('igb_uio_makefile', output: 'Makefile', command: ['touch', '@OUTPUT@']) diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index a5b88f0c6..a924c7b6f 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -3,6 +3,40 @@ subdirs = ['igb_uio'] -foreach d:subdirs - subdir(d) -endforeach +WARN_CROSS_COMPILE='Need "kernel_dir" option for kmod compilation when cross-compiling' +WARN_NO_HEADERS='Cannot compile kernel modules as requested - are kernel headers installed?' + +# if we are cross-compiling we need kernel_dir specified +# NOTE: warning() function only available from version 0.44 onwards +if get_option('kernel_dir') == '' and meson.is_cross_build() + if meson.version().version_compare('>=0.44') + warning(WARN_CROSS_COMPILE) + else + message('WARNING: ' + WARN_CROSS_COMPILE) + endif +else + + 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 + '/build' + endif + + # test running make in kernel directory, using "make kernelversion" + make_returncode = run_command('make', '-sC', kernel_dir, + 'kernelversion').returncode() + if make_returncode != 0 + if meson.version().version_compare('>=0.44') + warning(WARN_NO_HEADERS) + else + message('WARNING: ' + WARN_NO_HEADERS) + endif + else # returncode == 0 + +# DO ACTUAL MODULE BUILDING + foreach d:subdirs + subdir(d) + endforeach + endif +endif diff --git a/meson.build b/meson.build index cc16595cb..52a8746c5 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,6 @@ subdir('config') # build libs and drivers subdir('lib') -subdir('kernel') subdir('buildtools') subdir('drivers') @@ -40,6 +39,11 @@ if get_option('examples') != '' subdir('examples') endif +# build kernel modules if enabled +if get_option('enable_kmods') + subdir('kernel') +endif + # write the build config build_cfg = 'rte_build_config.h' configure_file(output: build_cfg, -- 2.14.3