From 9c1be11a4a6545af438a01e5df8c323f150aa56a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 17 May 2019 14:45:29 +0100 Subject: [PATCH] kernel/linux: remove unneeded meson variables The local variables for the error message aren't needed, since the messages aren't used more than once, and the indent levels are now such that the lines printing the message are not much longer than the lines defining the variables to hold the messages themselves. Therefore the use of the variables is pointless. Signed-off-by: Bruce Richardson Reviewed-by: David Marchand Acked-by: Luca Boccassi --- kernel/linux/meson.build | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index d31fc8f809..a37c957520 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -3,12 +3,9 @@ subdirs = ['igb_uio', 'kni'] -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 if get_option('kernel_dir') == '' and meson.is_cross_build() - warning(WARN_CROSS_COMPILE) + warning('Need "kernel_dir" option for kmod compilation when cross-compiling') subdir_done() endif @@ -23,7 +20,7 @@ endif make_returncode = run_command('make', '-sC', kernel_dir, 'kernelversion').returncode() if make_returncode != 0 - warning(WARN_NO_HEADERS) + warning('Cannot compile kernel modules as requested - are kernel headers installed?') subdir_done() endif -- 2.20.1