[dpdk-dev] [PATCH] build: use cat instead of more

[dpdk-dev] [PATCH] build: use cat instead of more

[Ali Alnubani]

This is to fix a build error with meson 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

The cat command can still be found on Windows if the ports of GNU
utilities are installed.

Fixes: c04172b5f031 ("build: add single source of DPDK version number")
Fixes: d320fe56bd51 ("build: use version number from config file")

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
 meson.build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index fa6bf3d07..55aa7c46d 100644
--- a/meson.build
+++ b/meson.build
@@ -3,8 +3,7 @@
 
 project('DPDK', 'C',
 	# Get version number from file.
-	# Use "more" rather than "cat" for windows compatibility.
-	version: run_command('more', files('VERSION')).stdout().strip(),
+	version: run_command('cat', files('VERSION')).stdout().strip(),
 	license: 'BSD',
 	default_options: ['buildtype=release', 'default_library=static'],
 	meson_version: '>= 0.47.1'
-- 
2.19.2

[dpdk-dev] [PATCH] build: use cat instead of more

[Ali Alnubani]

This is to fix a build error with meson 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

The cat command can still be found on Windows if the ports of GNU
utilities are installed.

Fixes: c04172b5f031 ("build: add single source of DPDK version number")
Fixes: d320fe56bd51 ("build: use version number from config file")

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
 meson.build | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index fa6bf3d07..55aa7c46d 100644
--- a/meson.build
+++ b/meson.build
@@ -3,8 +3,7 @@
 
 project('DPDK', 'C',
 	# Get version number from file.
-	# Use "more" rather than "cat" for windows compatibility.
-	version: run_command('more', files('VERSION')).stdout().strip(),
+	version: run_command('cat', files('VERSION')).stdout().strip(),
 	license: 'BSD',
 	default_options: ['buildtype=release', 'default_library=static'],
 	meson_version: '>= 0.47.1'
-- 
2.19.2

Re: [dpdk-dev] [PATCH] build: use cat instead of more

[Thomas Monjalon]

01/04/2019 12:36, Ali Alnubani:
> This is to fix a build error with meson 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
> 
> The cat command can still be found on Windows if the ports of GNU
> utilities are installed.
> 
> Fixes: c04172b5f031 ("build: add single source of DPDK version number")
> Fixes: d320fe56bd51 ("build: use version number from config file")
> 
> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>

Acked-by: Thomas Monjalon <thomas@monjalon.net>

It is fixing a regression on Linux.
I think we should take this fix urgently
and think about Windows in a next step.

"more" is an interactive command, we should not use it.
As suggested by Ali, we may require an extra dependency on Windows
to get some GNU utilities. Or if no other tools are required,
may we have a meson builtin to read a file?

Re: [dpdk-dev] [PATCH] build: use cat instead of more

[Thomas Monjalon]

01/04/2019 12:36, Ali Alnubani:
> This is to fix a build error with meson 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
> 
> The cat command can still be found on Windows if the ports of GNU
> utilities are installed.
> 
> Fixes: c04172b5f031 ("build: add single source of DPDK version number")
> Fixes: d320fe56bd51 ("build: use version number from config file")
> 
> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>

Acked-by: Thomas Monjalon <thomas@monjalon.net>

It is fixing a regression on Linux.
I think we should take this fix urgently
and think about Windows in a next step.

"more" is an interactive command, we should not use it.
As suggested by Ali, we may require an extra dependency on Windows
to get some GNU utilities. Or if no other tools are required,
may we have a meson builtin to read a file?

Re: [dpdk-dev] [PATCH] build: use cat instead of more

[Bruce Richardson]

On Mon, Apr 01, 2019 at 01:24:20PM +0200, Thomas Monjalon wrote:
> 01/04/2019 12:36, Ali Alnubani:
> > This is to fix a build error with meson 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
> > 
> > The cat command can still be found on Windows if the ports of GNU
> > utilities are installed.
> > 
> > Fixes: c04172b5f031 ("build: add single source of DPDK version number")
> > Fixes: d320fe56bd51 ("build: use version number from config file")
> > 
> > Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> 
> Acked-by: Thomas Monjalon <thomas@monjalon.net>
> 
> It is fixing a regression on Linux.
> I think we should take this fix urgently
> and think about Windows in a next step.
> 
> "more" is an interactive command, we should not use it.
> As suggested by Ali, we may require an extra dependency on Windows
> to get some GNU utilities. Or if no other tools are required,
> may we have a meson builtin to read a file?
> 
Should not need to do so. May I suggest using "find_program" function
instead of hard-coding the command. That allows a list of programs to be
specified and the first one found is used. Unfortunately, on windows the
direct equivalent of "cat" is "type" which is a built-in rather than
command as far as I can see, so find_program doesn't work for it. However,
the following should do:

version: run_command(find_program('cat', 'more'), files('VERSION')).stdout().strip()

Re: [dpdk-dev] [PATCH] build: use cat instead of more

[Bruce Richardson]

On Mon, Apr 01, 2019 at 01:24:20PM +0200, Thomas Monjalon wrote:
> 01/04/2019 12:36, Ali Alnubani:
> > This is to fix a build error with meson 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
> > 
> > The cat command can still be found on Windows if the ports of GNU
> > utilities are installed.
> > 
> > Fixes: c04172b5f031 ("build: add single source of DPDK version number")
> > Fixes: d320fe56bd51 ("build: use version number from config file")
> > 
> > Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> 
> Acked-by: Thomas Monjalon <thomas@monjalon.net>
> 
> It is fixing a regression on Linux.
> I think we should take this fix urgently
> and think about Windows in a next step.
> 
> "more" is an interactive command, we should not use it.
> As suggested by Ali, we may require an extra dependency on Windows
> to get some GNU utilities. Or if no other tools are required,
> may we have a meson builtin to read a file?
> 
Should not need to do so. May I suggest using "find_program" function
instead of hard-coding the command. That allows a list of programs to be
specified and the first one found is used. Unfortunately, on windows the
direct equivalent of "cat" is "type" which is a built-in rather than
command as far as I can see, so find_program doesn't work for it. However,
the following should do:

version: run_command(find_program('cat', 'more'), files('VERSION')).stdout().strip()

[dpdk-dev] [PATCH v2] build: use cat if found

[Ali Alnubani]

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 <alialnu@mellanox.com>
Signed-off-by: Bruce Richardson <bruce.richardson@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(-)

diff --git a/meson.build b/meson.build
index fa6bf3d07..6061c4b1e 100644
--- a/meson.build
+++ b/meson.build
@@ -3,8 +3,9 @@
 
 project('DPDK', 'C',
 	# Get version number from file.
-	# Use "more" rather than "cat" for windows compatibility.
-	version: run_command('more', files('VERSION')).stdout().strip(),
+	# Fallback to "more" for Windows compatibility.
+	version: run_command(find_program('cat', 'more'),
+		files('VERSION')).stdout().strip(),
 	license: 'BSD',
 	default_options: ['buildtype=release', 'default_library=static'],
 	meson_version: '>= 0.47.1'
-- 
2.19.2

[dpdk-dev] [PATCH v2] build: use cat if found

[Ali Alnubani]

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 <alialnu@mellanox.com>
Signed-off-by: Bruce Richardson <bruce.richardson@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(-)

diff --git a/meson.build b/meson.build
index fa6bf3d07..6061c4b1e 100644
--- a/meson.build
+++ b/meson.build
@@ -3,8 +3,9 @@
 
 project('DPDK', 'C',
 	# Get version number from file.
-	# Use "more" rather than "cat" for windows compatibility.
-	version: run_command('more', files('VERSION')).stdout().strip(),
+	# Fallback to "more" for Windows compatibility.
+	version: run_command(find_program('cat', 'more'),
+		files('VERSION')).stdout().strip(),
 	license: 'BSD',
 	default_options: ['buildtype=release', 'default_library=static'],
 	meson_version: '>= 0.47.1'
-- 
2.19.2

Re: [dpdk-dev] [PATCH v2] build: use cat if found

[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 <alialnu@mellanox.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@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?]

/Bruce

Re: [dpdk-dev] [PATCH v2] build: use cat if found

[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 <alialnu@mellanox.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@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?]

/Bruce

Re: [dpdk-dev] [PATCH v2] build: use cat if found

[Thomas Monjalon]

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 <alialnu@mellanox.com>
> > Signed-off-by: Bruce Richardson <bruce.richardson@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

Re: [dpdk-dev] [PATCH v2] build: use cat if found

[Thomas Monjalon]

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 <alialnu@mellanox.com>
> > Signed-off-by: Bruce Richardson <bruce.richardson@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