01/04/2019 17:48, Bruce Richardson: > 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 > > '::::::::::::::\n<RTE_SDK_PATH>VERSION\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 <alia...@mellanox.com> > > Signed-off-by: Bruce Richardson <bruce.richard...@intel.com> > > --- > > 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?]
Applied with title changed, thanks