summaryrefslogtreecommitdiffstats
path: root/scripts/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/bitbake')
-rwxr-xr-xscripts/bitbake42
1 files changed, 1 insertions, 41 deletions
diff --git a/scripts/bitbake b/scripts/bitbake
index 31a34b3..a8c67bb 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -57,26 +57,6 @@ elif [ -z "$BUILDDIR" ] ; then
57 BUILDDIR="`pwd`" 57 BUILDDIR="`pwd`"
58fi 58fi
59 59
60needtar="1"
61needgit="1"
62TARVERSION=`tar --version | head -n 1 | cut -d ' ' -f 4`
63GITVERSION=`git --version 2> /dev/null | cut -d ' ' -f 3`
64float_test() {
65 echo | awk 'END { exit ( !( '"$1"')); }'
66}
67version_compare() {
68 python -c "from distutils.version import LooseVersion; import sys; sys.exit(not (LooseVersion('$1') $2 LooseVersion('$3')))"
69}
70
71# Tar version 1.24 and onwards handle overwriting symlinks correctly
72# but earlier versions do not; this needs to work properly for sstate
73float_test "$TARVERSION > 1.23" && needtar="0"
74
75if [ ! -z $GITVERSION ]; then
76 # Need git >= 1.7.5 for git-remote --mirror=xxx syntax
77 version_compare $GITVERSION ">=" 1.7.5 && needgit="0"
78fi
79
80buildpseudo="1" 60buildpseudo="1"
81if [ $needpseudo = "1" ]; then 61if [ $needpseudo = "1" ]; then
82 if [ -e "$BUILDDIR/pseudodone" ]; then 62 if [ -e "$BUILDDIR/pseudodone" ]; then
@@ -103,14 +83,6 @@ if [ $needpseudo = "1" ]; then
103 fi 83 fi
104fi 84fi
105 85
106# If tar is already built, we don't want to do it again...
107if [ -e "$PSEUDOBINDIR/tar" -a "$needtar" = "1" ]; then
108 needtar="0"
109fi
110# If git is already built, we don't want to do it again...
111if [ -e "$PSEUDOBINDIR/git" -a "$needgit" = "1" ]; then
112 needgit="0"
113fi
114 86
115if [ $needpseudo = "0" ]; then 87if [ $needpseudo = "0" ]; then
116 buildpseudo="0" 88 buildpseudo="0"
@@ -133,14 +105,6 @@ if [ $buildpseudo -gt 0 ]; then
133 [ $buildpseudo -eq 2 ] && echo "Pseudo may be out of date, rebuilding pseudo before the main build" 105 [ $buildpseudo -eq 2 ] && echo "Pseudo may be out of date, rebuilding pseudo before the main build"
134 [ $buildpseudo -eq 3 ] && echo "Building pseudo-native before main build" 106 [ $buildpseudo -eq 3 ] && echo "Building pseudo-native before main build"
135 export PSEUDO_BUILD=1 107 export PSEUDO_BUILD=1
136 TARTARGET="tar-replacement-native"
137 if [ $needtar = "0" ]; then
138 TARTARGET=""
139 fi
140 GITTARGET="git-replacement-native"
141 if [ $needgit = "0" ]; then
142 GITTARGET=""
143 fi
144 108
145 # Pass through debug options 109 # Pass through debug options
146 additionalopts="" 110 additionalopts=""
@@ -154,11 +118,7 @@ if [ $buildpseudo -gt 0 ]; then
154 done 118 done
155 done 119 done
156 120
157 if [ $needtar = "1" ]; then 121 bitbake pseudo-native $additionalopts -c populate_sysroot
158 bitbake $TARTARGET -c populate_sysroot
159 fi
160
161 bitbake pseudo-native $GITTARGET $additionalopts -c populate_sysroot
162 ret=$? 122 ret=$?
163 if [ "$ret" != "0" ]; then 123 if [ "$ret" != "0" ]; then
164 exit 1 124 exit 1