Remove some absolute paths
PATCH 1/2 Remove some absolute paths
Buildroot fails to run on NixOS because it has no /bin/echo or /bin/grep. Instead of relying on absolute paths, rely on tools to be available in PATH. This should work for all systems.
--- support/dependencies/dependencies.sh | 96 ++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 48 deletions(-)
support/dependencies/dependencies.sh +48 -48
@@ -7,20 +7,20 @@ export LC_ALL=C # Verify that grep works echo "WORKS" | grep "WORKS" >/dev/null 2>&1 if test $? != 0 ; then - /bin/echo -e "\ngrep doesn't work\n" + echo -e "\ngrep doesn't work\n" exit 1 fi # sanity check for CWD in LD_LIBRARY_PATH # try not to rely on egrep.. if test -n "$LD_LIBRARY_PATH" ; then - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':\.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':\.TRiGGER_end' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 + echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.:' >/dev/null 2>&1 || + echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.:' >/dev/null 2>&1 || + echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || + echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then - /bin/echo -e "\nYou seem to have the current working directory in your" - /bin/echo -e "LD_LIBRARY_PATH environment variable. This doesn't work.\n" + echo -e "\nYou seem to have the current working directory in your" + echo -e "LD_LIBRARY_PATH environment variable. This doesn't work.\n" exit 1; fi fi;
@@ -29,51 +29,51 @@ fi; # in the PATH makes the toolchain build process break. # try not to rely on egrep.. if test -n "$PATH" ; then - /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep ':\.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep ':\.TRiGGER_end' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 + echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.:' >/dev/null 2>&1 || + echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.:' >/dev/null 2>&1 || + echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || + echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then - /bin/echo -e "\nYou seem to have the current working directory in your" - /bin/echo -e "PATH environment variable. This doesn't work.\n" + echo -e "\nYou seem to have the current working directory in your" + echo -e "PATH environment variable. This doesn't work.\n" exit 1; fi fi; if test -n "$PERL_MM_OPT" ; then - /bin/echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib" - /bin/echo -e "is installed on your system. Please unset this variable" - /bin/echo -e "before starting Buildroot, otherwise the compilation of" - /bin/echo -e "Perl related packages will fail" + echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib" + echo -e "is installed on your system. Please unset this variable" + echo -e "before starting Buildroot, otherwise the compilation of" + echo -e "Perl related packages will fail" exit 1 fi # Verify that which is installed if ! which which > /dev/null ; then - /bin/echo -e "\nYou must install 'which' on your build machine\n"; + echo -e "\nYou must install 'which' on your build machine\n"; exit 1; fi; if ! which sed > /dev/null ; then - /bin/echo -e "\nYou must install 'sed' on your build machine\n" + echo -e "\nYou must install 'sed' on your build machine\n" exit 1 fi # Check make MAKE=$(which make 2> /dev/null) if [ -z "$MAKE" ] ; then - /bin/echo -e "\nYou must install 'make' on your build machine\n"; + echo -e "\nYou must install 'make' on your build machine\n"; exit 1; fi; MAKE_VERSION=$($MAKE --version 2>&1 | sed -e 's/^.* \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$MAKE_VERSION" ] ; then - /bin/echo -e "\nYou must install 'make' on your build machine\n"; + echo -e "\nYou must install 'make' on your build machine\n"; exit 1; fi; MAKE_MAJOR=$(echo $MAKE_VERSION | sed -e "s/\..*//g") MAKE_MINOR=$(echo $MAKE_VERSION | sed -e "s/^$MAKE_MAJOR\.//g" -e "s/\..*//g" -e "s/[a-zA-Z].*//g") if [ $MAKE_MAJOR -lt 3 ] || [ $MAKE_MAJOR -eq 3 -a $MAKE_MINOR -lt 81 ] ; then - /bin/echo -e "\nYou have make '$MAKE_VERSION' installed. GNU make >=3.81 is required\n" + echo -e "\nYou have make '$MAKE_VERSION' installed. GNU make >=3.81 is required\n" exit 1; fi;
@@ -83,14 +83,14 @@ if [ -z "$COMPILER" ] ; then COMPILER=$(which cc 2> /dev/null) fi; if [ -z "$COMPILER" ] ; then - /bin/echo -e "\nYou must install 'gcc' on your build machine\n"; + echo -e "\nYou must install 'gcc' on your build machine\n"; exit 1; fi; COMPILER_VERSION=$($COMPILER -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$COMPILER_VERSION" ] ; then - /bin/echo -e "\nYou must install 'gcc' on your build machine\n"; + echo -e "\nYou must install 'gcc' on your build machine\n"; exit 1; fi; COMPILER_MAJOR=$(echo $COMPILER_VERSION | sed -e "s/\..*//g")
@@ -106,27 +106,27 @@ if [ -z "$CXXCOMPILER" ] ; then CXXCOMPILER=$(which c++ 2> /dev/null) fi if [ -z "$CXXCOMPILER" ] ; then - /bin/echo -e "\nYou may have to install 'g++' on your build machine\n" + echo -e "\nYou may have to install 'g++' on your build machine\n" #exit 1 fi if [ ! -z "$CXXCOMPILER" ] ; then CXXCOMPILER_VERSION=$($CXXCOMPILER -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$CXXCOMPILER_VERSION" ] ; then - /bin/echo -e "\nYou may have to install 'g++' on your build machine\n" + echo -e "\nYou may have to install 'g++' on your build machine\n" fi CXXCOMPILER_MAJOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/\..*//g") CXXCOMPILER_MINOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/^$CXXCOMPILER_MAJOR\.//g" -e "s/\..*//g") if [ $CXXCOMPILER_MAJOR -lt 3 -o $CXXCOMPILER_MAJOR -eq 2 -a $CXXCOMPILER_MINOR -lt 95 ] ; then - /bin/echo -e "\nYou have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required\n" + echo -e "\nYou have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required\n" exit 1 fi fi # Check bash if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then - /bin/echo -e "\nYou must install 'bash' on your build machine\n"; + echo -e "\nYou must install 'bash' on your build machine\n"; exit 1; fi;
@@ -134,16 +134,16 @@ fi; missing_progs="no" for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then - /bin/echo -e "You must install '$prog' on your build machine"; + echo -e "You must install '$prog' on your build machine"; missing_progs="yes" if test $prog = "svn" ; then - /bin/echo -e " svn is usually part of the subversion package in your distribution" + echo -e " svn is usually part of the subversion package in your distribution" elif test $prog = "hg" ; then - /bin/echo -e " hg is usually part of the mercurial package in your distribution" + echo -e " hg is usually part of the mercurial package in your distribution" elif test $prog = "zcat" ; then - /bin/echo -e " zcat is usually part of the gzip package in your distribution" + echo -e " zcat is usually part of the gzip package in your distribution" elif test $prog = "bzcat" ; then - /bin/echo -e " bzcat is usually part of the bzip2 package in your distribution" + echo -e " bzcat is usually part of the bzip2 package in your distribution" fi fi done
@@ -155,11 +155,11 @@ fi if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \ grep ^BR2_ENABLE_LOCALE=y $BUILDROOT_CONFIG > /dev/null ; then if ! which locale > /dev/null ; then - /bin/echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n" + echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n" exit 1 ; fi if ! locale -a | grep -q -i utf8$ ; then - /bin/echo -e "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n" + echo -e "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n" exit 1 ; fi fi
@@ -167,7 +167,7 @@ fi if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then for prog in javac jar; do if ! which $prog > /dev/null ; then - /bin/echo -e "\nYou must install '$prog' on your build machine\n" >&2 + echo -e "\nYou must install '$prog' on your build machine\n" >&2 exit 1 fi done
@@ -175,22 +175,22 @@ fi if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then if test ! -f /lib/ld-linux.so.2 ; then - /bin/echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture," - /bin/echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility" - /bin/echo -e "library." - /bin/echo -e "If you're running a Debian/Ubuntu distribution, install the libc6:i386," - /bin/echo -e "libstdc++6:i386, and zlib1g:i386 packages." - /bin/echo -e "For other distributions, refer to the documentation on how to install the 32 bits" - /bin/echo -e "compatibility libraries." + echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture," + echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility" + echo -e "library." + echo -e "If you're running a Debian/Ubuntu distribution, install the libc6:i386," + echo -e "libstdc++6:i386, and zlib1g:i386 packages." + echo -e "For other distributions, refer to the documentation on how to install the 32 bits" + echo -e "compatibility libraries." exit 1 fi fi if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BUILDROOT_CONFIG ; then if ! echo "int main(void) {}" | gcc -m32 -x c - ; then - /bin/echo -e "\nYour Buildroot configuration needs a compiler capable of building 32 bits binaries." - /bin/echo -e "If you're running a Debian/Ubuntu distribution, install the gcc-multilib package." - /bin/echo -e "For other distributions, refer to their documentation." + echo -e "\nYour Buildroot configuration needs a compiler capable of building 32 bits binaries." + echo -e "If you're running a Debian/Ubuntu distribution, install the gcc-multilib package." + echo -e "For other distributions, refer to their documentation." exit 1 fi fi
@@ -198,7 +198,7 @@ fi # Check that the Perl installation is complete enough to build # host-autoconf. if ! perl -e "require Data::Dumper" > /dev/null 2>&1 ; then - /bin/echo -e "Your Perl installation is not complete enough, at least Data::Dumper is missing." - /bin/echo -e "On Debian/Ubuntu distributions, install the 'perl' package." + echo -e "Your Perl installation is not complete enough, at least Data::Dumper is missing." + echo -e "On Debian/Ubuntu distributions, install the 'perl' package." exit 1 fi
Signature · 1 line
1.8.5.2
PATCH 1/2 Remove some absolute paths
Quoted 3 lines · Bj?rn Forsman
Buildroot fails to run on NixOS because it has no
/bin/echoor/bin/grep. Instead of relying on absolute paths, rely on tools to be available in PATH. This should work for all systems.
Ping?
When this is applied, make sure to also apply "[PATCH 2/2] Prefer 'printf' over 'echo -e' (for portability)".
Best regards,
Bj?rn Forsman
PATCH 1/2 Remove some absolute paths
In reply to Bjørn ForsmanIl 30/12/2013 17:31, Bj?rn Forsman ha scritto:
Quoted 14 lines
Buildroot fails to run on NixOS because it has no
/bin/echoor/bin/grep. Instead of relying on absolute paths, rely on tools to be available in PATH. This should work for all systems.Signed-off-by Bj?rn Forsman <[email protected]>--- support/dependencies/dependencies.sh | 96 ++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 48 deletions(-)support/dependencies/dependencies.sh +0
-0
support/dependencies/dependencies.sh export LC_ALL=C · line 10
Quoted 5 lines
support/dependencies/dependencies.sh +1
-1@@ -7,20 +7,20 @@ export LC_ALL=C # Verify that grep works echo "WORKS" | grep "WORKS" >/dev/null 2>&1 if test $? != 0 ; then - /bin/echo -e "\ngrep doesn't work\n" + echo -e "\ngrep doesn't work\n"
I'm ok with the change, but while we're touching these basig commands, why not replacing them with an ECHO and a GREP constant? Such as:
ECHO := $(shell which grep)
or, more simply:
ECHO := echo
and wherever it's used:
- /bin/echo -e "\ngrep doesn't work\n"
+ $(ECHO) -e "\ngrep doesn't work\n"
This is what we do i.e. for sed. See package/Makefile.in.
This allows successive changes to the command definition without the need for a massive search and replace.
Signature · 1 line
Luca
PATCH 1/2 Remove some absolute paths
Quoted 32 lines · Luca Ceresoli
Il 30/12/2013 17:31, Bj?rn Forsman ha scritto:
Quoted 16 lines
Buildroot fails to run on NixOS because it has no
/bin/echoor/bin/grep. Instead of relying on absolute paths, rely on tools to be available in PATH. This should work for all systems.Signed-off-by Bj?rn Forsman <[email protected]>--- support/dependencies/dependencies.sh | 96 ++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 48 deletions(-)support/dependencies/dependencies.sh +0
-0support/dependencies/dependencies.sh export LC_ALL=C · line 10
Quoted 5 lines
support/dependencies/dependencies.sh +1
-1@@ -7,20 +7,20 @@ export LC_ALL=C # Verify that grep works echo "WORKS" | grep "WORKS" >/dev/null 2>&1 if test $? != 0 ; then - /bin/echo -e "\ngrep doesn't work\n" + echo -e "\ngrep doesn't work\n"I'm ok with the change, but while we're touching these basig commands, why not replacing them with an ECHO and a GREP constant? Such as:
ECHO := $(shell which grep)
or, more simply:
ECHO := echo
and wherever it's used:
Quoted 7 lines
-
/bin/echo-e "\ngrep doesn't work\n"
+ $(ECHO) -e "\ngrep doesn't work\n"This is what we do i.e. for sed. See package/Makefile.in.
This allows successive changes to the command definition without the need for a massive search and replace.
I took a quick look in support/dependencies/* and there are interactions between several makefiles and shell scripts. Should all deps be defined in variables in support/dependencies/dependencies.mk and then only be *checked* in support/dependencies/dependencies.sh? Or should maybe everything, definitions and checking, be moved to makefiles?
Hm, package/Makefile.in also defines some "dependency" variables:
INSTALL, FLEX, BISON, SED. Looks like dependency handling/checking in Buildroot could use some refactoring.
"But why not just define local variables in support/dependencies/dependencies.sh?" My thinking is that as long as we're
- not using full paths
- not writing setuid tools
- not selecting between similarly named commands, but built for host or target
there is very little benefit from using e.g. ${GREP} instead of grep. Except that it's more difficult to type :-)
I see that SED is defined as "/path/to/sed -i -e". So mixing /path/to/tool and tool_options is a way to use such variables. But I don't think that's a good idea. I'd rather have separate variables, like SED and SED_OPTS, so that there are no surprises: "oh, SED changed the source file even though I didn't tell it to". Maybe SED should be renamed to SED_INLINE? Or SED_WITH_OPTS?
I guess one benefit from using variables for commands is that it makes the dependencies obvious. As in "if there is no variable defined for 'tool', don't use it", or "if there is no variable defined for 'tool', define it in the central location and then use it". But that is difficult to enforce. Just search for 'sed' in buildroot sources and you'll see :-)
To sum it up, I have mixed feelings about using variables for command names (that are always in PATH) and I think it is a different issue than this patch set is trying to solve.
Best regards,
Bj?rn Forsman
PATCH 1/2 Remove some absolute paths
On Tue, Dec 31, 2013 at 1:56 PM, Bj?rn Forsman <[email protected]> wrote:
[..]
Quoted 30 lines
Hm, package/Makefile.in also defines some "dependency" variables:
INSTALL, FLEX, BISON, SED. Looks like dependency handling/checking in Buildroot could use some refactoring."But why not just define local variables in
support/dependencies/dependencies.sh?" My thinking is that as long as we're- not using full paths
- not writing setuid tools
- not selecting between similarly named commands, but built for host or targetthere is very little benefit from using e.g. ${GREP} instead of grep. Except that it's more difficult to type :-)
I see that SED is defined as "/path/to/sed -i -e". So mixing /path/to/tool and
tool_optionsis a way to use such variables. But I don't think that's a good idea. I'd rather have separate variables, like SED andSED_OPTS, so that there are no surprises: "oh, SED changed the source file even though I didn't tell it to". Maybe SED should be renamed toSED_INLINE? OrSED_WITH_OPTS?I guess one benefit from using variables for commands is that it makes the dependencies obvious. As in "if there is no variable defined for 'tool', don't use it", or "if there is no variable defined for 'tool', define it in the central location and then use it". But that is difficult to enforce. Just search for 'sed' in buildroot sources and you'll see :-)
Quoted 3 lines
To sum it up, I have mixed feelings about using variables for command names (that are always in PATH) and I think it is a different issue than this patch set is trying to solve.
There is at least one reason why using variables to refer to tools in makefiles makes sense: in make, any variable can be overruled on the command-line. So you can call 'make SED=/my/own/sed' without any special rules in the makefile itself. This is not possible if you directly use 'sed' (or whatever tool).
Best regards,
Thomas
PATCH 1/2 Remove some absolute paths
Hi Thomas,
On 1 January 2014 18:13, Thomas De Schampheleire
<[email protected]> wrote:
[...]
Quoted 5 lines
There is at least one reason why using variables to refer to tools in makefiles makes sense: in make, any variable can be overruled on the command-line. So you can call 'make SED=/my/own/sed' without any special rules in the makefile itself. This is not possible if you directly use 'sed' (or whatever tool).
Good point.
I don't know if your remark was specific to my patch or just in general, but I'd like to point out this patch changes a shell script, not a makefile. Although a bit more troublesome than your make example, this injects custom 'sed' in any language:
PATH=/my/sed/bin:$PATH some_tool.
I consider this patch a minor "fix". Adding variables for commands (everywhere) in Buildroot is a different thing that should be in a different patch set.
Please let me know if there is anything in *this* patch that I need to change to get it merged.
Best regards,
Bj?rn Forsman
PATCH 2/2 Prefer 'printf' over 'echo -e' (for portability)
In reply to Bjørn Forsmansupport/dependencies/dependencies.sh uses #!/bin/sh shebang. It is not guaranteed that /bin/sh provides an 'echo' implementation that understands the '-e' flag (interpret backslash escape chars). For example, dash doesn't.
'printf' is more portable (it must interpret backslash escape chars, according to POSIX), so use that.
NOTE: Before the previous commit, the dependencies.sh script used /bin/echo instead of the shell built-in. That's probably why this hasn't come up before.
--- support/dependencies/dependencies.sh | 82 ++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 41 deletions(-)
support/dependencies/dependencies.sh +41 -41
@@ -7,7 +7,7 @@ export LC_ALL=C # Verify that grep works echo "WORKS" | grep "WORKS" >/dev/null 2>&1 if test $? != 0 ; then - echo -e "\ngrep doesn't work\n" + printf "\ngrep doesn't work\n" exit 1 fi
@@ -19,8 +19,8 @@ if test -n "$LD_LIBRARY_PATH" ; then echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then - echo -e "\nYou seem to have the current working directory in your" - echo -e "LD_LIBRARY_PATH environment variable. This doesn't work.\n" + printf "\nYou seem to have the current working directory in your" + printf "LD_LIBRARY_PATH environment variable. This doesn't work.\n" exit 1; fi fi;
@@ -34,46 +34,46 @@ if test -n "$PATH" ; then echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then - echo -e "\nYou seem to have the current working directory in your" - echo -e "PATH environment variable. This doesn't work.\n" + printf "\nYou seem to have the current working directory in your" + printf "PATH environment variable. This doesn't work.\n" exit 1; fi fi; if test -n "$PERL_MM_OPT" ; then - echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib" - echo -e "is installed on your system. Please unset this variable" - echo -e "before starting Buildroot, otherwise the compilation of" - echo -e "Perl related packages will fail" + printf "\nYou have PERL_MM_OPT defined because Perl local::lib" + echo "is installed on your system. Please unset this variable" + echo "before starting Buildroot, otherwise the compilation of" + echo "Perl related packages will fail" exit 1 fi # Verify that which is installed if ! which which > /dev/null ; then - echo -e "\nYou must install 'which' on your build machine\n"; + printf "\nYou must install 'which' on your build machine\n"; exit 1; fi; if ! which sed > /dev/null ; then - echo -e "\nYou must install 'sed' on your build machine\n" + printf "\nYou must install 'sed' on your build machine\n" exit 1 fi # Check make MAKE=$(which make 2> /dev/null) if [ -z "$MAKE" ] ; then - echo -e "\nYou must install 'make' on your build machine\n"; + printf "\nYou must install 'make' on your build machine\n"; exit 1; fi; MAKE_VERSION=$($MAKE --version 2>&1 | sed -e 's/^.* \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$MAKE_VERSION" ] ; then - echo -e "\nYou must install 'make' on your build machine\n"; + printf "\nYou must install 'make' on your build machine\n"; exit 1; fi; MAKE_MAJOR=$(echo $MAKE_VERSION | sed -e "s/\..*//g") MAKE_MINOR=$(echo $MAKE_VERSION | sed -e "s/^$MAKE_MAJOR\.//g" -e "s/\..*//g" -e "s/[a-zA-Z].*//g") if [ $MAKE_MAJOR -lt 3 ] || [ $MAKE_MAJOR -eq 3 -a $MAKE_MINOR -lt 81 ] ; then - echo -e "\nYou have make '$MAKE_VERSION' installed. GNU make >=3.81 is required\n" + printf "\nYou have make '$MAKE_VERSION' installed. GNU make >=3.81 is required\n" exit 1; fi;
@@ -83,20 +83,20 @@ if [ -z "$COMPILER" ] ; then COMPILER=$(which cc 2> /dev/null) fi; if [ -z "$COMPILER" ] ; then - echo -e "\nYou must install 'gcc' on your build machine\n"; + printf "\nYou must install 'gcc' on your build machine\n"; exit 1; fi; COMPILER_VERSION=$($COMPILER -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$COMPILER_VERSION" ] ; then - echo -e "\nYou must install 'gcc' on your build machine\n"; + printf "\nYou must install 'gcc' on your build machine\n"; exit 1; fi; COMPILER_MAJOR=$(echo $COMPILER_VERSION | sed -e "s/\..*//g") COMPILER_MINOR=$(echo $COMPILER_VERSION | sed -e "s/^$COMPILER_MAJOR\.//g" -e "s/\..*//g") if [ $COMPILER_MAJOR -lt 3 -o $COMPILER_MAJOR -eq 2 -a $COMPILER_MINOR -lt 95 ] ; then - echo "\nYou have gcc '$COMPILER_VERSION' installed. gcc >= 2.95 is required\n" + printf "\nYou have gcc '$COMPILER_VERSION' installed. gcc >= 2.95 is required\n" exit 1; fi;
@@ -106,27 +106,27 @@ if [ -z "$CXXCOMPILER" ] ; then CXXCOMPILER=$(which c++ 2> /dev/null) fi if [ -z "$CXXCOMPILER" ] ; then - echo -e "\nYou may have to install 'g++' on your build machine\n" + printf "\nYou may have to install 'g++' on your build machine\n" #exit 1 fi if [ ! -z "$CXXCOMPILER" ] ; then CXXCOMPILER_VERSION=$($CXXCOMPILER -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$CXXCOMPILER_VERSION" ] ; then - echo -e "\nYou may have to install 'g++' on your build machine\n" + printf "\nYou may have to install 'g++' on your build machine\n" fi CXXCOMPILER_MAJOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/\..*//g") CXXCOMPILER_MINOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/^$CXXCOMPILER_MAJOR\.//g" -e "s/\..*//g") if [ $CXXCOMPILER_MAJOR -lt 3 -o $CXXCOMPILER_MAJOR -eq 2 -a $CXXCOMPILER_MINOR -lt 95 ] ; then - echo -e "\nYou have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required\n" + printf "\nYou have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required\n" exit 1 fi fi # Check bash if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then - echo -e "\nYou must install 'bash' on your build machine\n"; + printf "\nYou must install 'bash' on your build machine\n"; exit 1; fi;
@@ -134,16 +134,16 @@ fi; missing_progs="no" for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then - echo -e "You must install '$prog' on your build machine"; + echo "You must install '$prog' on your build machine"; missing_progs="yes" if test $prog = "svn" ; then - echo -e " svn is usually part of the subversion package in your distribution" + echo " svn is usually part of the subversion package in your distribution" elif test $prog = "hg" ; then - echo -e " hg is usually part of the mercurial package in your distribution" + echo " hg is usually part of the mercurial package in your distribution" elif test $prog = "zcat" ; then - echo -e " zcat is usually part of the gzip package in your distribution" + echo " zcat is usually part of the gzip package in your distribution" elif test $prog = "bzcat" ; then - echo -e " bzcat is usually part of the bzip2 package in your distribution" + echo " bzcat is usually part of the bzip2 package in your distribution" fi fi done
@@ -155,11 +155,11 @@ fi if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \ grep ^BR2_ENABLE_LOCALE=y $BUILDROOT_CONFIG > /dev/null ; then if ! which locale > /dev/null ; then - echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n" + printf "\nYou need locale support on your build machine to build a toolchain supporting locales\n" exit 1 ; fi if ! locale -a | grep -q -i utf8$ ; then - echo -e "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n" + printf "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n" exit 1 ; fi fi
@@ -167,7 +167,7 @@ fi if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then for prog in javac jar; do if ! which $prog > /dev/null ; then - echo -e "\nYou must install '$prog' on your build machine\n" >&2 + printf "\nYou must install '$prog' on your build machine\n" >&2 exit 1 fi done
@@ -175,22 +175,22 @@ fi if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then if test ! -f /lib/ld-linux.so.2 ; then - echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture," - echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility" - echo -e "library." - echo -e "If you're running a Debian/Ubuntu distribution, install the libc6:i386," - echo -e "libstdc++6:i386, and zlib1g:i386 packages." - echo -e "For other distributions, refer to the documentation on how to install the 32 bits" - echo -e "compatibility libraries." + printf "\nYour Buildroot configuration uses pre-built tools for the x86 architecture," + echo "but your build machine uses the x86-64 architecture without the 32 bits compatibility" + echo "library." + echo "If you're running a Debian/Ubuntu distribution, install the libc6:i386," + echo "libstdc++6:i386, and zlib1g:i386 packages." + echo "For other distributions, refer to the documentation on how to install the 32 bits" + echo "compatibility libraries." exit 1 fi fi if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BUILDROOT_CONFIG ; then if ! echo "int main(void) {}" | gcc -m32 -x c - ; then - echo -e "\nYour Buildroot configuration needs a compiler capable of building 32 bits binaries." - echo -e "If you're running a Debian/Ubuntu distribution, install the gcc-multilib package." - echo -e "For other distributions, refer to their documentation." + printf "\nYour Buildroot configuration needs a compiler capable of building 32 bits binaries." + echo "If you're running a Debian/Ubuntu distribution, install the gcc-multilib package." + echo "For other distributions, refer to their documentation." exit 1 fi fi
@@ -198,7 +198,7 @@ fi # Check that the Perl installation is complete enough to build # host-autoconf. if ! perl -e "require Data::Dumper" > /dev/null 2>&1 ; then - echo -e "Your Perl installation is not complete enough, at least Data::Dumper is missing." - echo -e "On Debian/Ubuntu distributions, install the 'perl' package." + echo "Your Perl installation is not complete enough, at least Data::Dumper is missing." + echo "On Debian/Ubuntu distributions, install the 'perl' package." exit 1 fi
Signature · 1 line
1.8.5.2
PATCH 2/2 Prefer 'printf' over 'echo -e' (for portability)
Hi Bj?rn,
Quoted 54 lines · Bj?rn Forsman
support/dependencies/dependencies.shuses #!/bin/sh shebang. It is not guaranteed that/bin/shprovides an 'echo' implementation that understands the '-e' flag (interpret backslash escape chars). For example, dash doesn't.'printf' is more portable (it must interpret backslash escape chars, according to POSIX), so use that.
NOTE: Before the previous commit, the
dependencies.shscript used/bin/echoinstead of the shell built-in. That's probably why this hasn't come up before.Signed-off-by Bj?rn Forsman <[email protected]>--- support/dependencies/dependencies.sh | 82 ++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 41 deletions(-)support/dependencies/dependencies.sh +5
-5@@ -7,7 +7,7 @@ export LC_ALL=C # Verify that grep works echo "WORKS" | grep "WORKS" >/dev/null 2>&1 if test $? != 0 ; then - echo -e "\ngrep doesn't work\n" + printf "\ngrep doesn't work\n" exit 1 fi@@ -19,8 +19,8 @@ if test -n "$LD_LIBRARY_PATH" ; then echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then - echo -e "\nYou seem to have the current working directory in your" - echo -e "LD_LIBRARY_PATH environment variable. This doesn't work.\n" + printf "\nYou seem to have the current working directory in your" + printf "LD_LIBRARY_PATH environment variable. This doesn't work.\n" exit 1; fi fi;@@ -34,46 +34,46 @@ if test -n "$PATH" ; then echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then - echo -e "\nYou seem to have the current working directory in your" - echo -e "PATH environment variable. This doesn't work.\n" + printf "\nYou seem to have the current working directory in your" + printf "PATH environment variable. This doesn't work.\n" exit 1; fi fi; if test -n "$PERL_MM_OPT" ; then
support/dependencies/dependencies.sh if test -n "$PATH" ; then · line 49
Quoted 10 lines
support/dependencies/dependencies.sh +4
-4- echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib" - echo -e "is installed on your system. Please unset this variable" - echo -e "before starting Buildroot, otherwise the compilation of" - echo -e "Perl related packages will fail" + printf "\nYou have PERL_MM_OPT defined because Perl local::lib" + echo "is installed on your system. Please unset this variable" + echo "before starting Buildroot, otherwise the compilation of" + echo "Perl related packages will fail" exit 1 fi
I find it very strange that we're mixing printf and echo in this same file. I would suggest to either use echo only, or printf only. The statement
echo -e '\nblaat'
is functionally equivalent to:
echo
echo blaat
Your point about printf being more portable is valid, and has been raised in the past by Yann (I believe) as well.
This means that moving to printf iso echo makes sense, but then this patch should be reworked as to fix the entire file.
Note that this is just my opinion, I can't speak for the entire community.
Best regards,
Thomas
PATCH 2/2 Prefer 'printf' over 'echo -e' (for portability)
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> writes:
Hi,
Quoted 8 lines
I find it very strange that we're mixing printf and echo in this same file. I would suggest to either use echo only, or printf only. The statement
echo -e '\nblaat'
is functionally equivalent to:
echo
echo blaat
Quoted 6 lines
Your point about printf being more portable is valid, and has been raised in the past by Yann (I believe) as well.
This means that moving to printf iso echo makes sense, but then this patch should be reworked as to fix the entire file.Note that this is just my opinion, I can't speak for the entire community.
Yes, I agree. I would also like to see the same style used everywhere in the file.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 Prefer 'printf' over 'echo -e' (for portability)
Quoted 17 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> writes:
Hi,
Quoted 12 lines
I find it very strange that we're mixing printf and echo in this same file. I would suggest to either use echo only, or printf only. The statement
echo -e '\nblaat'
is functionally equivalent to:
echo
echo blaatYour point about printf being more portable is valid, and has been raised in the past by Yann (I believe) as well.
This means that moving to printf iso echo makes sense, but then this patch should be reworked as to fix the entire file.
Quoted 4 lines
Quoted 1 line
Note that this is just my opinion, I can't speak for the entire community.
Yes, I agree. I would also like to see the same style used everywhere in the file.
I agree. I'll fix it and send new patches.
PATCH 1/2 Remove some absolute paths
In reply to Bjørn ForsmanQuoted 236 lines · Bj?rn Forsman
Buildroot fails to run on NixOS because it has no
/bin/echoor/bin/grep. Instead of relying on absolute paths, rely on tools to be available in PATH. This should work for all systems.Signed-off-by Bj?rn Forsman <[email protected]>--- support/dependencies/dependencies.sh | 96 ++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 48 deletions(-)support/dependencies/dependencies.sh +46
-46@@ -7,20 +7,20 @@ export LC_ALL=C # Verify that grep works echo "WORKS" | grep "WORKS" >/dev/null 2>&1 if test $? != 0 ; then - /bin/echo -e "\ngrep doesn't work\n" + echo -e "\ngrep doesn't work\n" exit 1 fi # sanity check for CWD in LD_LIBRARY_PATH # try not to rely on egrep.. if test -n "$LD_LIBRARY_PATH" ; then - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':\.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep ':\.TRiGGER_end' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 + echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.:' >/dev/null 2>&1 || + echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.:' >/dev/null 2>&1 || + echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || + echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then - /bin/echo -e "\nYou seem to have the current working directory in your" - /bin/echo -e "LD_LIBRARY_PATH environment variable. This doesn't work.\n" + echo -e "\nYou seem to have the current working directory in your" + echo -e "LD_LIBRARY_PATH environment variable. This doesn't work.\n" exit 1; fi fi;@@ -29,51 +29,51 @@ fi; # in the PATH makes the toolchain build process break. # try not to rely on egrep.. if test -n "$PATH" ; then - /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep ':\.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.:' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep ':\.TRiGGER_end' >/dev/null 2>&1 || - /bin/echo TRiGGER_start"$PATH"TRiGGER_end | /bin/grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 + echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.:' >/dev/null 2>&1 || + echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.:' >/dev/null 2>&1 || + echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 || + echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1 if test $? = 0; then - /bin/echo -e "\nYou seem to have the current working directory in your" - /bin/echo -e "PATH environment variable. This doesn't work.\n" + echo -e "\nYou seem to have the current working directory in your" + echo -e "PATH environment variable. This doesn't work.\n" exit 1; fi fi; if test -n "$PERL_MM_OPT" ; then - /bin/echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib" - /bin/echo -e "is installed on your system. Please unset this variable" - /bin/echo -e "before starting Buildroot, otherwise the compilation of" - /bin/echo -e "Perl related packages will fail" + echo -e "\nYou have PERL_MM_OPT defined because Perl local::lib" + echo -e "is installed on your system. Please unset this variable" + echo -e "before starting Buildroot, otherwise the compilation of" + echo -e "Perl related packages will fail" exit 1 fi # Verify that which is installed if ! which which > /dev/null ; then - /bin/echo -e "\nYou must install 'which' on your build machine\n"; + echo -e "\nYou must install 'which' on your build machine\n"; exit 1; fi; if ! which sed > /dev/null ; then - /bin/echo -e "\nYou must install 'sed' on your build machine\n" + echo -e "\nYou must install 'sed' on your build machine\n" exit 1 fi # Check make MAKE=$(which make 2> /dev/null) if [ -z "$MAKE" ] ; then - /bin/echo -e "\nYou must install 'make' on your build machine\n"; + echo -e "\nYou must install 'make' on your build machine\n"; exit 1; fi; MAKE_VERSION=$($MAKE --version 2>&1 | sed -e 's/^.* \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$MAKE_VERSION" ] ; then - /bin/echo -e "\nYou must install 'make' on your build machine\n"; + echo -e "\nYou must install 'make' on your build machine\n"; exit 1; fi; MAKE_MAJOR=$(echo $MAKE_VERSION | sed -e "s/\..*//g") MAKE_MINOR=$(echo $MAKE_VERSION | sed -e "s/^$MAKE_MAJOR\.//g" -e "s/\..*//g" -e "s/[a-zA-Z].*//g") if [ $MAKE_MAJOR -lt 3 ] || [ $MAKE_MAJOR -eq 3 -a $MAKE_MINOR -lt 81 ] ; then - /bin/echo -e "\nYou have make '$MAKE_VERSION' installed. GNU make >=3.81 is required\n" + echo -e "\nYou have make '$MAKE_VERSION' installed. GNU make >=3.81 is required\n" exit 1; fi;@@ -83,14 +83,14 @@ if [ -z "$COMPILER" ] ; then COMPILER=$(which cc 2> /dev/null) fi; if [ -z "$COMPILER" ] ; then - /bin/echo -e "\nYou must install 'gcc' on your build machine\n"; + echo -e "\nYou must install 'gcc' on your build machine\n"; exit 1; fi; COMPILER_VERSION=$($COMPILER -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$COMPILER_VERSION" ] ; then - /bin/echo -e "\nYou must install 'gcc' on your build machine\n"; + echo -e "\nYou must install 'gcc' on your build machine\n"; exit 1; fi; COMPILER_MAJOR=$(echo $COMPILER_VERSION | sed -e "s/\..*//g")@@ -106,27 +106,27 @@ if [ -z "$CXXCOMPILER" ] ; then CXXCOMPILER=$(which c++ 2> /dev/null) fi if [ -z "$CXXCOMPILER" ] ; then - /bin/echo -e "\nYou may have to install 'g++' on your build machine\n" + echo -e "\nYou may have to install 'g++' on your build machine\n" #exit 1 fi if [ ! -z "$CXXCOMPILER" ] ; then CXXCOMPILER_VERSION=$($CXXCOMPILER -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q') if [ -z "$CXXCOMPILER_VERSION" ] ; then - /bin/echo -e "\nYou may have to install 'g++' on your build machine\n" + echo -e "\nYou may have to install 'g++' on your build machine\n" fi CXXCOMPILER_MAJOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/\..*//g") CXXCOMPILER_MINOR=$(echo $CXXCOMPILER_VERSION | sed -e "s/^$CXXCOMPILER_MAJOR\.//g" -e "s/\..*//g") if [ $CXXCOMPILER_MAJOR -lt 3 -o $CXXCOMPILER_MAJOR -eq 2 -a $CXXCOMPILER_MINOR -lt 95 ] ; then - /bin/echo -e "\nYou have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required\n" + echo -e "\nYou have g++ '$CXXCOMPILER_VERSION' installed. g++ >= 2.95 is required\n" exit 1 fi fi # Check bash if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then - /bin/echo -e "\nYou must install 'bash' on your build machine\n"; + echo -e "\nYou must install 'bash' on your build machine\n"; exit 1; fi;@@ -134,16 +134,16 @@ fi; missing_progs="no" for prog in patch perl tar wget cpio python unzip rsync bc ${DL_TOOLS} ; do if ! which $prog > /dev/null ; then - /bin/echo -e "You must install '$prog' on your build machine"; + echo -e "You must install '$prog' on your build machine"; missing_progs="yes" if test $prog = "svn" ; then - /bin/echo -e " svn is usually part of the subversion package in your distribution" + echo -e " svn is usually part of the subversion package in your distribution" elif test $prog = "hg" ; then - /bin/echo -e " hg is usually part of the mercurial package in your distribution" + echo -e " hg is usually part of the mercurial package in your distribution" elif test $prog = "zcat" ; then - /bin/echo -e " zcat is usually part of the gzip package in your distribution" + echo -e " zcat is usually part of the gzip package in your distribution" elif test $prog = "bzcat" ; then - /bin/echo -e " bzcat is usually part of the bzip2 package in your distribution" + echo -e " bzcat is usually part of the bzip2 package in your distribution" fi fi done@@ -155,11 +155,11 @@ fi if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BUILDROOT_CONFIG > /dev/null && \ grep ^BR2_ENABLE_LOCALE=y $BUILDROOT_CONFIG > /dev/null ; then if ! which locale > /dev/null ; then - /bin/echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n" + echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n" exit 1 ; fi if ! locale -a | grep -q -i utf8$ ; then - /bin/echo -e "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n" + echo -e "\nYou need at least one UTF8 locale to build a toolchain supporting locales\n" exit 1 ; fi fi@@ -167,7 +167,7 @@ fi if grep -q ^BR2_PACKAGE_CLASSPATH=y $BUILDROOT_CONFIG ; then for prog in javac jar; do if ! which $prog > /dev/null ; then - /bin/echo -e "\nYou must install '$prog' on your build machine\n" >&2 + echo -e "\nYou must install '$prog' on your build machine\n" >&2 exit 1 fi done@@ -175,22 +175,22 @@ fi if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BUILDROOT_CONFIG ; then if test ! -f /lib/ld-linux.so.2 ; then - /bin/echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture," - /bin/echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility" - /bin/echo -e "library." - /bin/echo -e "If you're running a Debian/Ubuntu distribution, install the libc6:i386," - /bin/echo -e "libstdc++6:i386, and zlib1g:i386 packages." - /bin/echo -e "For other distributions, refer to the documentation on how to install the 32 bits" - /bin/echo -e "compatibility libraries." + echo -e "\nYour Buildroot configuration uses pre-built tools for the x86 architecture," + echo -e "but your build machine uses the x86-64 architecture without the 32 bits compatibility" + echo -e "library." + echo -e "If you're running a Debian/Ubuntu distribution, install the libc6:i386," + echo -e "libstdc++6:i386, and zlib1g:i386 packages." + echo -e "For other distributions, refer to the documentation on how to install the 32 bits" + echo -e "compatibility libraries." exit 1 fi fi if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BUILDROOT_CONFIG ; then if ! echo "int main(void) {}" | gcc -m32 -x c - ; then - /bin/echo -e "\nYour Buildroot configuration needs a compiler capable of building 32 bits binaries." - /bin/echo -e "If you're running a Debian/Ubuntu distribution, install the gcc-multilib package." - /bin/echo -e "For other distributions, refer to their documentation." + echo -e "\nYour Buildroot configuration needs a compiler capable of building 32 bits binaries." + echo -e "If you're running a Debian/Ubuntu distribution, install the gcc-multilib package." + echo -e "For other distributions, refer to their documentation." exit 1 fi fi
support/dependencies/dependencies.sh fi · line 204
Quoted 9 lines
support/dependencies/dependencies.sh +2
-2@@ -198,7 +198,7 @@ fi # Check that the Perl installation is complete enough to build # host-autoconf. if ! perl -e "require Data::Dumper" > /dev/null 2>&1 ; then - /bin/echo -e "Your Perl installation is not complete enough, at least Data::Dumper is missing." - /bin/echo -e "On Debian/Ubuntu distributions, install the 'perl' package." + echo -e "Your Perl installation is not complete enough, at least Data::Dumper is missing." + echo -e "On Debian/Ubuntu distributions, install the 'perl' package." exit 1 fi
Although the discussion raised some interesting points, I believe this patch is ok to accept as-is.
Best regards,
Thomas
PATCH 1/2 Remove some absolute paths
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> writes:
Hi,
Quoted 4 lines
Although the discussion raised some interesting points, I believe this patch is ok to accept as-is.
True. The explicit /bin/echo was afaik to make sure we end up with an echo variant (most likely coreutils) that understands -e, but if we're changing it to printf anyway.
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 Remove some absolute paths
Quoted 6 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas De Schampheleire <[email protected]> writes:
Hi,
Quoted 1 line
Quoted 8 lines
Quoted 2 lines
Although the discussion raised some interesting points, I believe this patch is ok to accept as-is.
True. The explicit
/bin/echowas afaik to make sure we end up with an echo variant (most likely coreutils) that understands -e, but if we're changing it to printf anyway.Committed, thanks.
Oops, this patch wasn't supposted to be commited all by itself and not followed by the "[PATCH 2/2] Prefer
'printf' over 'echo -e' (for portability)" patch. With the current use of "echo -e" there will be breakage if /bin/sh is dash.
Peter, could you apply the 2nd patch also and then I can submit a separate patch afterwards to stop the echo/printf mix?
Best regards,
Bj?rn Forsman
PATCH 1/2 Remove some absolute paths
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bj?rn" == Bj?rn Forsman <[email protected]> writes:
Hi,
Quoted 7 lines
Oops, this patch wasn't supposted to be commited all by itself and not followed by the "[PATCH 2/2] Prefer
'printf' over 'echo -e' (for portability)" patch. With the current use of "echo -e" there will be breakage if/bin/shis dash.Peter, could you apply the 2nd patch also and then I can submit a separate patch afterwards to stop the echo/printf mix?
Ok, committed - Thanks.
Signature · 1 line
Bye, Peter Korsgaard