[U-Boot] [PATCH 0/3] Do not hard-code the command name 'make' in upper-level tools
Masahiro Yamada (3): scripts: add scripts/gnu_make to not hard-code make command MAKEALL: make sure to invoke GNU Make buildman: make sure to invoke GNU Make
MAKEALL | 8 +++++--- scripts/gnu_make | 30 ++++++++++++++++++++++++++++++ tools/buildman/builder.py | 3 ++- 3 files changed, 37 insertions(+), 4 deletions(-) create mode 100755 scripts/gnu_make
U-Boot is expected to be built on various platforms but makefiles are written for GNU Make.
We should keep in mind that the command 'make' is not always GNU Make.
For example, on Linux, people generally do:
make <board>_config; make
But FreeBSD folks do
gmake <board>_config; gmake
(The command 'make' on FreeBSD is BSD Make, not GNU Make)
It is not a good idea to hard-code the command name 'make' in MAKEALL or buildman.
Instead, they should call the make command via this helper script to make sure it is GNU Make.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
scripts/gnu_make | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 scripts/gnu_make
diff --git a/scripts/gnu_make b/scripts/gnu_make new file mode 100755 index 0000000..2eeafbb --- /dev/null +++ b/scripts/gnu_make @@ -0,0 +1,30 @@ +#!/bin/sh +# +# Call GNU Make +# +# U-Boot is supposed to be built on various platforms. +# One problem is that the command 'make' is not always GNU Make. +# (For ex. the command name for GNU Make on FreeBSD is usually 'gmake'.) +# It is not a good idea to hard-code the command name 'make' +# in scripts where where GNU Make is expected. +# In that case, call this helper script to make sure to invoke GNU Make. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +gnu_make= + +for m in make gmake +do + if $m --version 2>/dev/null | grep -q GNU; then + gnu_make=$m + break + fi +done + +if [ -z "$gnu_make" ]; then + echo "GNU Make not found" >&2 + exit 1 +fi + +$gnu_make "$@"
Hello Masahiro,
On 17-07-14 11:18, Masahiro Yamada wrote:
U-Boot is expected to be built on various platforms but makefiles are written for GNU Make.
We should keep in mind that the command 'make' is not always GNU Make.
For example, on Linux, people generally do:
make <board>_config; make
But FreeBSD folks do
gmake <board>_config; gmake
(The command 'make' on FreeBSD is BSD Make, not GNU Make)
It is not a good idea to hard-code the command name 'make' in MAKEALL or buildman.
indeed, not a good idea.
Instead, they should call the make command via this helper script to make sure it is GNU Make.
yup, or the name of the executable could be displayed, so it only needs to be checked once at startup (and error out if no GNU make is found at all).
+++ b/scripts/gnu_make
nitpicking, most script use a dash instead of an underscore.
@@ -0,0 +1,30 @@ +#!/bin/sh +# +# Call GNU Make +# +# U-Boot is supposed to be built on various platforms. +# One problem is that the command 'make' is not always GNU Make. +# (For ex. the command name for GNU Make on FreeBSD is usually 'gmake'.) +# It is not a good idea to hard-code the command name 'make' +# in scripts where where GNU Make is expected. +# In that case, call this helper script to make sure to invoke GNU Make. +# +# SPDX-License-Identifier: GPL-2.0+ +#
+gnu_make=
+for m in make gmake +do
- if $m --version 2>/dev/null | grep -q GNU; then
gnu_make=$mbreak- fi
+done
+if [ -z "$gnu_make" ]; then
- echo "GNU Make not found" >&2
- exit 1
+fi
+$gnu_make "$@"
I guess, it could use exec here, since the script itself is no longer needed.
Regards, Jeroen
Hi Jeroen,
On Fri, 18 Jul 2014 20:19:52 +0200 Jeroen Hofstee jeroen@myspectrum.nl wrote:
Instead, they should call the make command via this helper script to make sure it is GNU Make.
yup, or the name of the executable could be displayed, so it only needs to be checked once at startup (and error out if no GNU make is found at all).
Good idea!
MAKEALL and buildman generally invoke make for a lot of boards. Searching it once at startup seems better.
+++ b/scripts/gnu_make
nitpicking, most script use a dash instead of an underscore.
Renamed in v2.
Best Regards Masahiro Yamada
Since the command name 'make' is not GNU Make on some platforms such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
MAKEALL | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/MAKEALL b/MAKEALL index 37ef71e..02c2f9f 100755 --- a/MAKEALL +++ b/MAKEALL @@ -630,14 +630,16 @@ build_target() { output_dir="${OUTPUT_PREFIX}" fi
+ GNU_MAKE=scripts/gnu_make + target_arch=$(get_target_arch ${target}) eval cross_toolchain=$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'` if [ "${cross_toolchain}" ] ; then - MAKE="make CROSS_COMPILE=${cross_toolchain}" + MAKE="$GNU_MAKE CROSS_COMPILE=${cross_toolchain}" elif [ "${CROSS_COMPILE}" ] ; then - MAKE="make CROSS_COMPILE=${CROSS_COMPILE}" + MAKE="$GNU_MAKE CROSS_COMPILE=${CROSS_COMPILE}" else - MAKE=make + MAKE=$GNU_MAKE fi
if [ "${output_dir}" != "." ] ; then
Hello Masahiro,
On 17-07-14 11:18, Masahiro Yamada wrote:
Since the command name 'make' is not GNU Make on some platforms such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
MAKEALL | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/MAKEALL b/MAKEALL index 37ef71e..02c2f9f 100755 --- a/MAKEALL +++ b/MAKEALL @@ -630,14 +630,16 @@ build_target() { output_dir="${OUTPUT_PREFIX}" fi
- GNU_MAKE=scripts/gnu_make
- target_arch=$(get_target_arch ${target}) eval cross_toolchain=$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'` if [ "${cross_toolchain}" ] ; then
MAKE="make CROSS_COMPILE=${cross_toolchain}"
MAKE="$GNU_MAKE CROSS_COMPILE=${cross_toolchain}"
MAKE="make CROSS_COMPILE=${CROSS_COMPILE}"
MAKE="$GNU_MAKE CROSS_COMPILE=${CROSS_COMPILE}"
MAKE=make
MAKE=$GNU_MAKEfi
if [ "${output_dir}" != "." ] ; then
while by itself this might be correct, opt is not a POSIX command and MAKEALL will not work at all on a BSD host. Perhaps it is time I have a look at what buildman is....
Regards, Jeroen
Hi Jeroen,
On 18 July 2014 12:29, Jeroen Hofstee dasuboot@myspectrum.nl wrote:
Hello Masahiro,
On 17-07-14 11:18, Masahiro Yamada wrote:
Since the command name 'make' is not GNU Make on some platforms such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
MAKEALL | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/MAKEALL b/MAKEALL index 37ef71e..02c2f9f 100755 --- a/MAKEALL +++ b/MAKEALL @@ -630,14 +630,16 @@ build_target() { output_dir="${OUTPUT_PREFIX}" fi
GNU_MAKE=scripts/gnu_maketarget_arch=$(get_target_arch ${target}) eval cross_toolchain=\$CROSS_COMPILE_`echo $target_arch | tr'[:lower:]' '[:upper:]'` if [ "${cross_toolchain}" ] ; then
MAKE="make CROSS_COMPILE=${cross_toolchain}"
MAKE="$GNU_MAKE CROSS_COMPILE=${cross_toolchain}" elif [ "${CROSS_COMPILE}" ] ; then
MAKE="make CROSS_COMPILE=${CROSS_COMPILE}"
MAKE="$GNU_MAKE CROSS_COMPILE=${CROSS_COMPILE}" else
MAKE=make
MAKE=$GNU_MAKE fi if [ "${output_dir}" != "." ] ; thenwhile by itself this might be correct, opt is not a POSIX command and MAKEALL will not work at all on a BSD host. Perhaps it is time I have a look at what buildman is....
http://patchwork.ozlabs.org/patch/369788/
:-)
Regards, Simon
Since the command name 'make' is not GNU Make on some platforms such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com ---
tools/buildman/builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 4a2d753..c68cc8c 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -667,7 +667,8 @@ class Builder: args: Arguments to pass to make kwargs: Arguments to pass to command.RunPipe() """ - cmd = ['make'] + list(args) + gnu_make = os.path.join(self.git_dir, '../scripts/gnu_make') + cmd = [gnu_make] + list(args) result = command.RunPipe([cmd], capture=True, capture_stderr=True, cwd=cwd, raise_on_error=False, **kwargs) return result
On 17 July 2014 03:18, Masahiro Yamada yamada.m@jp.panasonic.com wrote:
Since the command name 'make' is not GNU Make on some platforms such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
Maybe you will rename the script, but the code looks good.
Acked-by: Simon Glass sjg@chromium.org
Hello Masahiro,
On 17-07-14 11:18, Masahiro Yamada wrote:
Since the command name 'make' is not GNU Make on some platforms such as FreeBSD, MAKEALL should call the make via scripts/gnu_make.
Signed-off-by: Masahiro Yamada yamada.m@jp.panasonic.com
tools/buildman/builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 4a2d753..c68cc8c 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -667,7 +667,8 @@ class Builder: args: Arguments to pass to make kwargs: Arguments to pass to command.RunPipe() """
cmd = ['make'] + list(args)
gnu_make = os.path.join(self.git_dir, '../scripts/gnu_make')cmd = [gnu_make] + list(args) result = command.RunPipe([cmd], capture=True, capture_stderr=True, cwd=cwd, raise_on_error=False, **kwargs) return result
with a trick to let buildman call clang, this works fine on FreeBSD.
Tested-By: Jeroen Hofstee jeroen@myspectrum.nl
Regards, Jeroen
participants (4)
-
Jeroen Hofstee -
Jeroen Hofstee -
Masahiro Yamada -
Simon Glass