]> code.ossystems Code Review - openembedded-core.git/commitdiff
scripts/bitbake: Remove all instances of paths to a layer's scripts directory.
authorFranklin S. Cooper Jr <fcooper@ti.com>
Sat, 9 Feb 2013 17:08:10 +0000 (11:08 -0600)
committerRoss Burton <ross.burton@intel.com>
Tue, 19 Feb 2013 11:15:55 +0000 (11:15 +0000)
* 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@ti.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
scripts/bitbake

index 79a81eaf0faaf580ad40e7dfa36b1920c791e6b0..ca2bc82d0424f2725aa338561a8b7b4c1fd693fd 100755 (executable)
@@ -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"