X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=kernel%2Flinux%2Fmeson.build;h=5c864a465344daf32df6211f7e18ef4cdb9f34ea;hb=532e4e48ca0a70a687e6919834b83dd243f6101e;hp=d31fc8f8099b4a22799db1a4039e00a9209e1324;hpb=41dec89f5450ce4ad37982c9a1cf121a2dd18829;p=dpdk.git

diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index d31fc8f809..5c864a4653 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -1,30 +1,25 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-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?'
+subdirs = ['kni']
 
 # if we are cross-compiling we need kernel_dir specified
 if get_option('kernel_dir') == '' and meson.is_cross_build()
-	warning(WARN_CROSS_COMPILE)
-	subdir_done()
+	error('Need "kernel_dir" option for kmod compilation when cross-compiling')
 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 + '/build'
+	kernel_dir = '/lib/modules/' + kernel_version
 endif
 
 # test running make in kernel directory, using "make kernelversion"
-make_returncode = run_command('make', '-sC', kernel_dir,
+make_returncode = run_command('make', '-sC', kernel_dir + '/build',
 		'kernelversion').returncode()
 if make_returncode != 0
-	warning(WARN_NO_HEADERS)
-	subdir_done()
+	error('Cannot compile kernel modules as requested - are kernel headers installed?')
 endif
 
 # DO ACTUAL MODULE BUILDING