From patchwork Fri May 17 13:45:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 53525 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4339A5F72; Fri, 17 May 2019 15:45:39 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id A3CD25F3C for ; Fri, 17 May 2019 15:45:37 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 06:45:37 -0700 X-ExtLoop1: 1 Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga004.jf.intel.com with ESMTP; 17 May 2019 06:45:36 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, bluca@debian.org, Bruce Richardson Date: Fri, 17 May 2019 14:45:27 +0100 Message-Id: <20190517134529.18160-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190517134529.18160-1-bruce.richardson@intel.com> References: <20190430140325.45537-1-bruce.richardson@intel.com> <20190517134529.18160-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/3] kernel/linux: remove unnecessary meson version check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The check for meson version 0.44 is redundant since the minimum supported version for the project as a whole is 0.47. Signed-off-by: Bruce Richardson Reviewed-by: David Marchand --- 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') From patchwork Fri May 17 13:45:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 53526 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A8597CB0; Fri, 17 May 2019 15:45:41 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id EBD0B6904 for ; Fri, 17 May 2019 15:45:39 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 06:45:39 -0700 X-ExtLoop1: 1 Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga004.jf.intel.com with ESMTP; 17 May 2019 06:45:38 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, bluca@debian.org, Bruce Richardson Date: Fri, 17 May 2019 14:45:28 +0100 Message-Id: <20190517134529.18160-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190517134529.18160-1-bruce.richardson@intel.com> References: <20190430140325.45537-1-bruce.richardson@intel.com> <20190517134529.18160-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/3] kernel/linux: reduce unneeded indents in meson build file X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since meson 0.46, meson has supported the subdir_done() function, which allows us to abort processing of a file early. Using this we can reduce the indentation in our files by eliminating unnecessary else blocks. Signed-off-by: Bruce Richardson Reviewed-by: David Marchand --- kernel/linux/meson.build | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/kernel/linux/meson.build b/kernel/linux/meson.build index bf8f085b0..d31fc8f80 100644 --- a/kernel/linux/meson.build +++ b/kernel/linux/meson.build @@ -9,25 +9,25 @@ WARN_NO_HEADERS='Cannot compile kernel modules as requested - are kernel headers # if we are cross-compiling we need kernel_dir specified if get_option('kernel_dir') == '' and meson.is_cross_build() warning(WARN_CROSS_COMPILE) -else + subdir_done() +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 + '/build' +endif - # test running make in kernel directory, using "make kernelversion" - make_returncode = run_command('make', '-sC', kernel_dir, - 'kernelversion').returncode() - if make_returncode != 0 - warning(WARN_NO_HEADERS) - else # returncode == 0 +# test running make in kernel directory, using "make kernelversion" +make_returncode = run_command('make', '-sC', kernel_dir, + 'kernelversion').returncode() +if make_returncode != 0 + warning(WARN_NO_HEADERS) + subdir_done() +endif # DO ACTUAL MODULE BUILDING - foreach d:subdirs - subdir(d) - endforeach - endif -endif +foreach d:subdirs + subdir(d) +endforeach From patchwork Fri May 17 13:45:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 53527 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C20C58E76; Fri, 17 May 2019 15:45:49 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 004297D4A for ; Fri, 17 May 2019 15:45:47 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 06:45:47 -0700 X-ExtLoop1: 1 Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga004.jf.intel.com with ESMTP; 17 May 2019 06:45:45 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, bluca@debian.org, Bruce Richardson Date: Fri, 17 May 2019 14:45:29 +0100 Message-Id: <20190517134529.18160-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190517134529.18160-1-bruce.richardson@intel.com> References: <20190430140325.45537-1-bruce.richardson@intel.com> <20190517134529.18160-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 3/3] kernel/linux: remove unneeded local variables X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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 d31fc8f80..a37c95752 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