X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=kernel%2Flinux%2Fmeson.build;h=5c864a465344daf32df6211f7e18ef4cdb9f34ea;hb=56bb5841fd0608989101d933f091852a3126b4fe;hp=a924c7b6fb28872bf9d730d771b0b6caf5ce7630;hpb=89200580ef0f89ef247ca32e9299c670beb95cc0;p=dpdk.git

diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index a924c7b6fb..5c864a4653 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -1,42 +1,28 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-subdirs = ['igb_uio']
-
-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
-# NOTE: warning() function only available from version 0.44 onwards
 if get_option('kernel_dir') == '' and meson.is_cross_build()
-	if meson.version().version_compare('>=0.44')
-		warning(WARN_CROSS_COMPILE)
-	else
-		message('WARNING: ' + WARN_CROSS_COMPILE)
-	endif
-else
+	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'
-	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
+endif
 
-	# test running make in kernel directory, using "make kernelversion"
-	make_returncode = run_command('make', '-sC', kernel_dir,
-			'kernelversion').returncode()
-	if make_returncode != 0
-		if meson.version().version_compare('>=0.44')
-			warning(WARN_NO_HEADERS)
-		else
-			message('WARNING: ' + WARN_NO_HEADERS)
-		endif
-	else # returncode == 0
+# test running make in kernel directory, using "make kernelversion"
+make_returncode = run_command('make', '-sC', kernel_dir + '/build',
+		'kernelversion').returncode()
+if make_returncode != 0
+	error('Cannot compile kernel modules as requested - are kernel headers installed?')
+endif
 
 # DO ACTUAL MODULE BUILDING
-		foreach d:subdirs
-			subdir(d)
-		endforeach
-	endif
-endif
+foreach d:subdirs
+	subdir(d)
+endforeach