[oe-commits] Franklin S. Cooper Jr : scripts/bitbake: Remove all instances of paths to a layer's scripts directory.

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: danny
Commit: 00d0e1ac741e5fc01a40feb7dcc7ecd3906b5ce4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=00d0e1ac741e5fc01a40feb7dcc7ecd3906b5ce4

Author: Franklin S. Cooper Jr <fcooper at ti.com>
Date:   Sat Feb  9 11:08:10 2013 -0600

scripts/bitbake: Remove all instances of paths to a layer's scripts directory.

* Currently the assumption is made that only oe-core can include a scripts
  directory.

* However, when other layers create a scripts directory the bitbake script
  freaks out causing a infinite recursive loop until it crashes.

* Simply changing the regular expression to remove all instances of scripts path
  instead of just the first one fixes this problem.

 [Yocto Bug 3872]

Signed-off-by: Franklin S. Cooper Jr <fcooper at ti.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 scripts/bitbake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/bitbake b/scripts/bitbake
index 79a81ea..ca2bc82 100755
--- a/scripts/bitbake
+++ b/scripts/bitbake
@@ -126,7 +126,7 @@ if [ $needpseudo != "0" -a $buildpseudo -eq 0 ]; then
 fi
 
 OLDPATH=$PATH
-export PATH=`echo $PATH | sed s#[^:]*/scripts:##`
+export PATH=`echo $PATH | sed s#[^:]*/scripts:##g`
 if [ $buildpseudo -gt 0 ]; then
     [ $buildpseudo -eq 1 ] && echo "Pseudo is not present but is required, building this first before the main build"
     [ $buildpseudo -eq 2 ] && echo "Pseudo may be out of date, rebuilding pseudo before the main build"