From 455be5b47f666ddbfa1dcc49575143a3cd01f6b7 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Mon, 11 May 2020 11:25:13 +0100 Subject: [PATCH] kernel/linux: error out on module build failure Now that kernel modules aren't built by default, we can be more strict with their build process, and fail the build if they were requested to be built, but weren't. Signed-off-by: Anatoly Burakov Acked-by: Bruce Richardson --- kernel/linux/meson.build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index 1796cc6861..da79df1687 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -5,8 +5,7 @@ subdirs = ['igb_uio', 'kni'] # if we are cross-compiling we need kernel_dir specified if get_option('kernel_dir') == '' and meson.is_cross_build() - warning('Need "kernel_dir" option for kmod compilation when cross-compiling') - subdir_done() + error('Need "kernel_dir" option for kmod compilation when cross-compiling') endif kernel_dir = get_option('kernel_dir') @@ -20,8 +19,7 @@ endif make_returncode = run_command('make', '-sC', kernel_dir + '/build', 'kernelversion').returncode() if make_returncode != 0 - warning('Cannot compile kernel modules as requested - are kernel headers installed?') - subdir_done() + error('Cannot compile kernel modules as requested - are kernel headers installed?') endif # DO ACTUAL MODULE BUILDING -- 2.20.1