diff options
| -rwxr-xr-x | scripts/bitbake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/bitbake b/scripts/bitbake index ca2bc82d04..31a34b3f16 100755 --- a/scripts/bitbake +++ b/scripts/bitbake | |||
| @@ -60,7 +60,7 @@ fi | |||
| 60 | needtar="1" | 60 | needtar="1" |
| 61 | needgit="1" | 61 | needgit="1" |
| 62 | TARVERSION=`tar --version | head -n 1 | cut -d ' ' -f 4` | 62 | TARVERSION=`tar --version | head -n 1 | cut -d ' ' -f 4` |
| 63 | GITVERSION=`git --version | cut -d ' ' -f 3` | 63 | GITVERSION=`git --version 2> /dev/null | cut -d ' ' -f 3` |
| 64 | float_test() { | 64 | float_test() { |
| 65 | echo | awk 'END { exit ( !( '"$1"')); }' | 65 | echo | awk 'END { exit ( !( '"$1"')); }' |
| 66 | } | 66 | } |
| @@ -72,9 +72,10 @@ version_compare() { | |||
| 72 | # but earlier versions do not; this needs to work properly for sstate | 72 | # but earlier versions do not; this needs to work properly for sstate |
| 73 | float_test "$TARVERSION > 1.23" && needtar="0" | 73 | float_test "$TARVERSION > 1.23" && needtar="0" |
| 74 | 74 | ||
| 75 | # Need git >= 1.7.5 for git-remote --mirror=xxx syntax | 75 | if [ ! -z $GITVERSION ]; then |
| 76 | version_compare $GITVERSION ">=" 1.7.5 && needgit="0" | 76 | # Need git >= 1.7.5 for git-remote --mirror=xxx syntax |
| 77 | 77 | version_compare $GITVERSION ">=" 1.7.5 && needgit="0" | |
| 78 | fi | ||
| 78 | 79 | ||
| 79 | buildpseudo="1" | 80 | buildpseudo="1" |
| 80 | if [ $needpseudo = "1" ]; then | 81 | if [ $needpseudo = "1" ]; then |
