From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 68E4DA09E4; Fri, 29 Jan 2021 11:29:25 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3EC1B240134; Fri, 29 Jan 2021 11:29:24 +0100 (CET) Received: from lb.pantheon.sk (lb.pantheon.sk [46.229.239.20]) by mails.dpdk.org (Postfix) with ESMTP id 1635F40694 for ; Fri, 29 Jan 2021 11:29:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by lb.pantheon.sk (Postfix) with ESMTP id 09940BFD91; Fri, 29 Jan 2021 11:29:21 +0100 (CET) X-Virus-Scanned: amavisd-new at siecit.sk Received: from lb.pantheon.sk ([127.0.0.1]) by localhost (lb.pantheon.sk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AI5c_VhUkATE; Fri, 29 Jan 2021 11:29:20 +0100 (CET) Received: from service-node1.lab.pantheon.local (unknown [46.229.239.141]) by lb.pantheon.sk (Postfix) with ESMTP id 26038BF47B; Fri, 29 Jan 2021 11:29:20 +0100 (CET) From: =?UTF-8?q?Juraj=20Linke=C5=A1?= To: bruce.richardson@intel.com, thomas@monjalon.net, Ruifeng.Wang@arm.com, jerinjacobk@gmail.com, hemant.agrawal@nxp.com, ferruh.yigit@intel.com, aboyer@pensando.io Cc: dev@dpdk.org, =?UTF-8?q?Juraj=20Linke=C5=A1?= Date: Fri, 29 Jan 2021 11:29:19 +0100 Message-Id: <1611916159-32158-1-git-send-email-juraj.linkes@pantheon.tech> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [RFC PATCH v1] build: kni gcc cross-compilation support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" The kni linux module is using a custom target for building, which doesn't take into account any cross compilation arguments. The arguments in question are ARCH and CROSS_COMPILE. Get those from the cross file and pass them to the custom target. The user supplied path may not contain the 'build' directory, such as when using cross-compiled headers, so only append that in the default case (when no path is supplied in native builds) and use the unmodified path from the user otherwise. Signed-off-by: Juraj Linkeš --- kernel/linux/kni/meson.build | 4 ++-- kernel/linux/meson.build | 33 +++++++++++++++++++++++++++++---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/kernel/linux/kni/meson.build b/kernel/linux/kni/meson.build index 07e0c9dae..0fbf52c93 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' + @@ -21,7 +21,7 @@ custom_target('rte_kni', ' -I' + meson.source_root() + '/lib/librte_kni' + ' -I' + meson.build_root() + ' -I' + meson.current_source_dir(), - 'modules'], + 'modules'] + cross_args, depends: kni_mkfile, install: true, install_dir: kernel_dir + '/extra/dpdk', diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index 5c864a465..57ed9bc48 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -3,20 +3,45 @@ subdirs = ['kni'] +cross_args = [] # if we are cross-compiling we need kernel_dir specified -if get_option('kernel_dir') == '' and meson.is_cross_build() - error('Need "kernel_dir" option for kmod compilation when cross-compiling') +if meson.is_cross_build() + if get_option('kernel_dir') == '' + error('Need "kernel_dir" option for kmod compilation when cross-compiling') + else + cross_compiler = find_program('c').path() + if cross_compiler.endswith('gcc') + cross_prefix = '' + # remove the 'gcc' suffix + # meson doesn't support removing elements from an array + # nor does it support slicing, so do it on our own + foreach element : cross_compiler.split('-') + if element != 'gcc' + cross_prefix += '@0@-'.format(element) + endif + endforeach + else + error('Unsupported cross compiler: @0@'.format(cross_compiler)) + endif + if host_machine.cpu_family() == 'aarch64' + cross_arch = 'arm64' + else + cross_arch = build_machine.cpu_family() + endif + cross_args = ['ARCH=@0@'.format(cross_arch), + 'CROSS_COMPILE=@0@'.format(cross_prefix)] + endif endif 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 error('Cannot compile kernel modules as requested - are kernel headers installed?') -- 2.20.1