summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-01-31 11:38:35 +0000
committerJoshua Lock <josh@linux.intel.com>2011-01-31 11:38:35 +0000
commit7e206c6477934df9d885e4d109e15705d88907b2 (patch)
treeb2ff16aa263c403a2dfa39dba8ee45d0c3863e71 /scripts
parent92f1b4976b4352d0dbd43392b59628c85873b063 (diff)
downloadpoky-7e206c6477934df9d885e4d109e15705d88907b2.tar.gz
scripts/bitbake: remove bashisms
As the BitBake script is the initial entry point for the system we need to ensure it can run in as many places as possible, including systems which aren't yest optimally configured for running Poky. Remove some bashisms from the script so that it can run under Dash. Pointers from: https://wiki.ubuntu.com/DashAsBinSh Errors before this patch: http://pastie.org/1502136 Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bitbake12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/bitbake b/scripts/bitbake
index 55bc8fd437..f40bd28260 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -3,29 +3,29 @@ NO_BUILD_OPTS="--version -h --help -p --parse-only -s --show-versions -e --envir
3needpseudo="1" 3needpseudo="1"
4for opt in $@; do 4for opt in $@; do
5for key in $NO_BUILD_OPTS; do 5for key in $NO_BUILD_OPTS; do
6 if [ $opt == $key ] 6 if [ $opt = $key ]
7 then 7 then
8 needpseudo="0" 8 needpseudo="0"
9 break 9 break
10 fi 10 fi
11done 11done
12[ $needpseudo == "0" ] && break 12[ $needpseudo = "0" ] && break
13done 13done
14 14
15buildpseudo="1" 15buildpseudo="1"
16if [ $needpseudo == "1" -a -e "$BUILDDIR/pseudodone" ]; then 16if [ $needpseudo = "1" ] && [ -e "$BUILDDIR/pseudodone" ]; then
17 PSEUDOBINDIR=`cat $BUILDDIR/pseudodone` 17 PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
18 if [ -e "$PSEUDOBINDIR/pseudo" ]; then 18 if [ -e "$PSEUDOBINDIR/pseudo" ]; then
19 buildpseudo="0" 19 buildpseudo="0"
20 fi 20 fi
21fi 21fi
22if [ $needpseudo == "0" ]; then 22if [ $needpseudo = "0" ]; then
23 buildpseudo="0" 23 buildpseudo="0"
24fi 24fi
25 25
26OLDPATH=$PATH 26OLDPATH=$PATH
27export PATH=`echo $PATH | sed s#[^:]*/scripts:##` 27export PATH=`echo $PATH | sed s#[^:]*/scripts:##`
28if [ $buildpseudo == "1" ]; then 28if [ $buildpseudo = "1" ]; then
29 echo "Pseudo is not present but is required, building this first before the main build" 29 echo "Pseudo is not present but is required, building this first before the main build"
30 bitbake pseudo-native -c populate_sysroot 30 bitbake pseudo-native -c populate_sysroot
31 ret=$? 31 ret=$?
@@ -43,7 +43,7 @@ if [ $buildpseudo == "1" ]; then
43fi 43fi
44BITBAKE=`which bitbake` 44BITBAKE=`which bitbake`
45export PATH=$OLDPATH 45export PATH=$OLDPATH
46if [ $needpseudo == "1" ]; then 46if [ $needpseudo = "1" ]; then
47 PSEUDOBINDIR=`cat $BUILDDIR/pseudodone` 47 PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
48 PSEUDO_BINDIR=$PSEUDOBINDIR PSEUDO_LIBDIR=$PSEUDOBINDIR/../lib/pseudo/lib PSEUDO_PREFIX=$PSEUDOBINDIR/../../ PSEUDO_DISABLED=1 $PSEUDOBINDIR/pseudo $BITBAKE $@ 48 PSEUDO_BINDIR=$PSEUDOBINDIR PSEUDO_LIBDIR=$PSEUDOBINDIR/../lib/pseudo/lib PSEUDO_PREFIX=$PSEUDOBINDIR/../../ PSEUDO_DISABLED=1 $PSEUDOBINDIR/pseudo $BITBAKE $@
49else 49else