diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-21 10:05:48 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-22 17:16:55 +0100 |
| commit | d95a27b4d9eac34eaf125f7cdf261a215f7f11d1 (patch) | |
| tree | bf2836716e53e03d645b9d3abb8360f0ec6b79a6 /scripts/bitbake | |
| parent | 70e5a74bcebc033b1066a7dd6096e634d5db60a2 (diff) | |
| download | ast2050-yocto-poky-d95a27b4d9eac34eaf125f7cdf261a215f7f11d1.zip ast2050-yocto-poky-d95a27b4d9eac34eaf125f7cdf261a215f7f11d1.tar.gz | |
scripts/bitbake: Handle the case where git isn't installed cleanly
Currently the user sees ugly errors if git isn't installed, this patch
cleans up the code to correctly handle that case.
(From OE-Core rev: aeb704fee8b4ffeaeddcdb36ae4e1d62c264ce42)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/bitbake')
| -rwxr-xr-x | scripts/bitbake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/bitbake b/scripts/bitbake index ca2bc82..31a34b3 100755 --- a/scripts/bitbake +++ b/scripts/bitbake @@ -60,7 +60,7 @@ fi needtar="1" needgit="1" TARVERSION=`tar --version | head -n 1 | cut -d ' ' -f 4` -GITVERSION=`git --version | cut -d ' ' -f 3` +GITVERSION=`git --version 2> /dev/null | cut -d ' ' -f 3` float_test() { echo | awk 'END { exit ( !( '"$1"')); }' } @@ -72,9 +72,10 @@ version_compare() { # but earlier versions do not; this needs to work properly for sstate float_test "$TARVERSION > 1.23" && needtar="0" -# Need git >= 1.7.5 for git-remote --mirror=xxx syntax -version_compare $GITVERSION ">=" 1.7.5 && needgit="0" - +if [ ! -z $GITVERSION ]; then + # Need git >= 1.7.5 for git-remote --mirror=xxx syntax + version_compare $GITVERSION ">=" 1.7.5 && needgit="0" +fi buildpseudo="1" if [ $needpseudo = "1" ]; then |
