From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id D1B064CA7 for ; Mon, 1 Apr 2019 17:48:36 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Apr 2019 08:48:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,297,1549958400"; d="scan'208";a="312195831" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.35]) by orsmga005.jf.intel.com with SMTP; 01 Apr 2019 08:48:33 -0700 Received: by (sSMTP sendmail emulation); Mon, 01 Apr 2019 16:48:31 +0100 Date: Mon, 1 Apr 2019 16:48:30 +0100 From: Bruce Richardson To: Ali Alnubani Cc: "dev@dpdk.org" , Thomas Monjalon , "ferruh.yigit@intel.com" Message-ID: <20190401154830.GA1452@bricha3-MOBL.ger.corp.intel.com> References: <20190401103551.28909-1-alialnu@mellanox.com> <20190401153836.30807-1-alialnu@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190401153836.30807-1-alialnu@mellanox.com> User-Agent: Mutt/1.11.4 (2019-03-13) Subject: Re: [dpdk-dev] [PATCH v2] build: use cat if found 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: , X-List-Received-Date: Mon, 01 Apr 2019 15:48:37 -0000 On Mon, Apr 01, 2019 at 03:38:59PM +0000, Ali Alnubani wrote: > This is to fix a build error with meson in GNU/Linux that is caused > by using the 'more' command to read the VERSION file. The error: > > config/meson.build:10:10: ERROR: String > '::::::::::::::\nVERSION\n::::::::::::::\n19' cannot be > converted to int > > The command 'more' prints the file name before the actual > contents of the file when it's being run without a controlling terminal. > This could happen in CI environments. > > Please refer to: > https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/text-utils/more.c > > Fixes: c04172b5f031 ("build: add single source of DPDK version number") > Fixes: d320fe56bd51 ("build: use version number from config file") > > Signed-off-by: Ali Alnubani > Signed-off-by: Bruce Richardson > --- > Changes in v2: > - Use find_program to fallback to 'more'. > - Update patch title. > > meson.build | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > Thanks for the V2, code change looks good now. For the title, I think this is really a bug-fix so I'd suggest something like: build: fix meson build in CI environments as more helpful. [Thomas, can you correct on apply, or do you want a v3?] /Bruce From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id BB90BA0679 for ; Mon, 1 Apr 2019 17:48:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8F5A94CAF; Mon, 1 Apr 2019 17:48:38 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id D1B064CA7 for ; Mon, 1 Apr 2019 17:48:36 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Apr 2019 08:48:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,297,1549958400"; d="scan'208";a="312195831" Received: from bricha3-mobl.ger.corp.intel.com ([10.237.221.35]) by orsmga005.jf.intel.com with SMTP; 01 Apr 2019 08:48:33 -0700 Received: by (sSMTP sendmail emulation); Mon, 01 Apr 2019 16:48:31 +0100 Date: Mon, 1 Apr 2019 16:48:30 +0100 From: Bruce Richardson To: Ali Alnubani Cc: "dev@dpdk.org" , Thomas Monjalon , "ferruh.yigit@intel.com" Message-ID: <20190401154830.GA1452@bricha3-MOBL.ger.corp.intel.com> References: <20190401103551.28909-1-alialnu@mellanox.com> <20190401153836.30807-1-alialnu@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190401153836.30807-1-alialnu@mellanox.com> User-Agent: Mutt/1.11.4 (2019-03-13) Subject: Re: [dpdk-dev] [PATCH v2] build: use cat if found 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" Message-ID: <20190401154830.duAJYs8ZslsAZrip7gbxaVf4m1MDKeIE4f0tH5Eeqv0@z> On Mon, Apr 01, 2019 at 03:38:59PM +0000, Ali Alnubani wrote: > This is to fix a build error with meson in GNU/Linux that is caused > by using the 'more' command to read the VERSION file. The error: > > config/meson.build:10:10: ERROR: String > '::::::::::::::\nVERSION\n::::::::::::::\n19' cannot be > converted to int > > The command 'more' prints the file name before the actual > contents of the file when it's being run without a controlling terminal. > This could happen in CI environments. > > Please refer to: > https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/text-utils/more.c > > Fixes: c04172b5f031 ("build: add single source of DPDK version number") > Fixes: d320fe56bd51 ("build: use version number from config file") > > Signed-off-by: Ali Alnubani > Signed-off-by: Bruce Richardson > --- > Changes in v2: > - Use find_program to fallback to 'more'. > - Update patch title. > > meson.build | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > Thanks for the V2, code change looks good now. For the title, I think this is really a bug-fix so I'd suggest something like: build: fix meson build in CI environments as more helpful. [Thomas, can you correct on apply, or do you want a v3?] /Bruce