[19.08,1/3] kernel/linux: remove unnecessary meson version check

Message ID 20190430140325.45537-2-bruce.richardson@intel.com
State Superseded
Delegated to: Thomas Monjalon
Headers show
Series
  • cleanup kernel meson.build file for linux
Related show

Checks

Context Check Description
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Bruce Richardson April 30, 2019, 2:03 p.m.
The check for meson version 0.44 is not redundant since the minimum
supported version for the project as a whole is 0.47.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 kernel/linux/meson.build | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Bruce Richardson April 30, 2019, 2:13 p.m. | #1
On Tue, Apr 30, 2019 at 03:03:23PM +0100, Bruce Richardson wrote:
> The check for meson version 0.44 is not redundant since the minimum

"not", in this case, being used as a synonym for "now" :-)

> supported version for the project as a whole is 0.47.
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  kernel/linux/meson.build | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
> index d751d939f..bf8f085b0 100644
> --- a/kernel/linux/meson.build
> +++ b/kernel/linux/meson.build
> @@ -7,13 +7,8 @@ WARN_CROSS_COMPILE='Need "kernel_dir" option for kmod compilation when cross-com
>  WARN_NO_HEADERS='Cannot compile kernel modules as requested - are kernel headers installed?'
>  
>  # 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
> +	warning(WARN_CROSS_COMPILE)
>  else
>  
>  	kernel_dir = get_option('kernel_dir')
> -- 
> 2.20.1
>

Patch

diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build
index d751d939f..bf8f085b0 100644
--- a/kernel/linux/meson.build
+++ b/kernel/linux/meson.build
@@ -7,13 +7,8 @@  WARN_CROSS_COMPILE='Need "kernel_dir" option for kmod compilation when cross-com
 WARN_NO_HEADERS='Cannot compile kernel modules as requested - are kernel headers installed?'
 
 # 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
+	warning(WARN_CROSS_COMPILE)
 else
 
 	kernel_dir = get_option('kernel_dir')