From: "Juraj Linkeš" <juraj.linkes@pantheon.tech>
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, "Juraj Linkeš" <juraj.linkes@pantheon.tech>
Subject: [dpdk-dev] [RFC PATCH v1] build: kni gcc cross-compilation support
Date: Fri, 29 Jan 2021 11:29:19 +0100 [thread overview]
Message-ID: <1611916159-32158-1-git-send-email-juraj.linkes@pantheon.tech> (raw)
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š <juraj.linkes@pantheon.tech>
---
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
next reply other threads:[~2021-01-29 10:29 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 10:29 Juraj Linkeš [this message]
2021-01-29 11:43 ` Bruce Richardson
2021-01-29 12:33 ` Juraj Linkeš
2021-01-29 13:51 ` Bruce Richardson
2021-01-29 14:36 ` Juraj Linkeš
2021-01-29 14:42 ` Bruce Richardson
2021-01-29 14:47 ` Juraj Linkeš
2021-01-29 15:01 ` Bruce Richardson
2021-01-29 15:17 ` Juraj Linkeš
2021-01-29 15:39 ` Bruce Richardson
2021-02-01 7:48 ` Juraj Linkeš
2021-02-04 9:51 ` [dpdk-dev] [RFC PATCH v2] build: kni " Juraj Linkeš
2021-02-04 17:33 ` Bruce Richardson
2021-02-05 9:26 ` Juraj Linkeš
2021-02-05 9:38 ` Bruce Richardson
2021-02-05 9:44 ` Thomas Monjalon
2021-02-05 9:42 ` Bruce Richardson
2021-02-05 14:46 ` [dpdk-dev] [RFC PATCH v3] " Juraj Linkeš
2021-02-05 14:52 ` Bruce Richardson
2021-02-05 15:02 ` Juraj Linkeš
2021-02-05 15:04 ` [dpdk-dev] [RFC PATCH v4] " Juraj Linkeš
2021-02-05 15:27 ` Bruce Richardson
2021-02-08 10:17 ` Juraj Linkeš
2021-02-08 10:26 ` Bruce Richardson
2021-02-08 10:56 ` Thomas Monjalon
2021-02-08 11:05 ` Bruce Richardson
2021-02-08 11:21 ` Thomas Monjalon
2021-02-08 11:45 ` Bruce Richardson
2021-02-08 17:23 ` Thomas Monjalon
2021-02-09 8:47 ` [dpdk-dev] [PATCH v5] " Juraj Linkeš
2021-02-09 11:50 ` Bruce Richardson
2021-02-09 12:07 ` Juraj Linkeš
2021-02-09 12:39 ` Bruce Richardson
2021-02-11 12:59 ` [dpdk-dev] [PATCH v6] " Juraj Linkeš
2021-03-09 8:47 ` Juraj Linkeš
2021-03-09 16:26 ` Andrew Boyer
2021-03-15 22:45 ` Thomas Monjalon
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=1611916159-32158-1-git-send-email-juraj.linkes@pantheon.tech \
--to=juraj.linkes@pantheon.tech \
--cc=Ruifeng.Wang@arm.com \
--cc=aboyer@pensando.io \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=hemant.agrawal@nxp.com \
--cc=jerinjacobk@gmail.com \
--cc=thomas@monjalon.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).