[PATCH 0/1] fixing bug #625

[PATCH 0/1] fixing bug #625

[Lianhao Lu]

Skip building pseudo if the options passing to the bitbake contains one of the followings:
 --version
 -h
 --help
 -p
 --parse-only
 -s
 --show-versions
 -e
 --environment

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: llu/bug625
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug625

Thanks,
    Lianhao Lu <lianhao.lu@intel.com>
---


Lianhao Lu (1):
  scripts/bitbake: Skip building pseudo if necessary.

 scripts/bitbake |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

[PATCH 1/1] scripts/bitbake: Skip building pseudo if necessary.

[Lianhao Lu]

Fixed [BUGID# 625]. Skip building pseudo if necessary by parsing the
options to bitbake.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---
 scripts/bitbake |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/scripts/bitbake b/scripts/bitbake
index 2c03314..df4e215 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -1,7 +1,20 @@
 #!/bin/sh
+NO_BUILD_OPTS="--version -h --help -p --parse-only -s --show-versions -e --environment"
+no_build="0"
+for opt in $@; do
+for key in $NO_BUILD_OPTS; do
+    if [ $opt == $key ]
+    then
+        no_build="1"
+        break
+    fi
+done
+[ $no_build == "1" ] && break
+done
+
 OLDPATH=$PATH
 export PATH=`echo $PATH | sed s#[^:]*/scripts:##`
-if [ ! -e "$BUILDDIR/pseudodone" ]; then
+if [ ! -e "$BUILDDIR/pseudodone" -a $no_build == "0" ]; then
     echo "Pseudo has not been built, building this first before the main build"
     bitbake pseudo-native
     ret=$?
@@ -19,7 +32,12 @@ if [ ! -e "$BUILDDIR/pseudodone" ]; then
 fi
 BITBAKE=`which bitbake`
 export PATH=$OLDPATH
-PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
-PSEUDO_BINDIR=$PSEUDOBINDIR PSEUDO_LIBDIR=$PSEUDOBINDIR/../lib/pseudo/lib PSEUDO_PREFIX=$PSEUDOBINDIR/../../ PSEUDO_DISABLED=1 $PSEUDOBINDIR/pseudo $BITBAKE $@
+if [ $no_build == "0" ]
+then
+    PSEUDOBINDIR=`cat $BUILDDIR/pseudodone`
+    PSEUDO_BINDIR=$PSEUDOBINDIR PSEUDO_LIBDIR=$PSEUDOBINDIR/../lib/pseudo/lib PSEUDO_PREFIX=$PSEUDOBINDIR/../../ PSEUDO_DISABLED=1 $PSEUDOBINDIR/pseudo $BITBAKE $@
+else
+    $BITBAKE $@
+fi
 ret=$?
 exit $ret
-- 
1.7.0.4

Re: [PATCH 0/1] fixing bug #625

[Richard Purdie]

On Wed, 2011-01-05 at 18:39 +0800, Lianhao Lu wrote:
> Skip building pseudo if the options passing to the bitbake contains one of the followings:
>  --version
>  -h
>  --help
>  -p
>  --parse-only
>  -s
>  --show-versions
>  -e
>  --environment
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: llu/bug625
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=llu/bug625
> 
> Thanks,
>     Lianhao Lu <lianhao.lu@intel.com>

Merged into master, thanks.

Richard