Patchwork [for-danny] scripts/bitbake: Remove all instances of paths to a layer's scripts directory.

login
mail settings
Submitter Denys Dmytriyenko
Date Feb. 16, 2013, 1:58 a.m.
Message ID <1360979912-470-1-git-send-email-denis@denix.org>
Download mbox | patch
Permalink /patch/44711/
State New
Headers show

Comments

Denys Dmytriyenko - Feb. 16, 2013, 1:58 a.m.
From: "Franklin S. Cooper Jr" <fcooper@ti.com>

* 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ross Burton - Feb. 19, 2013, 11:18 a.m.
On 16 February 2013 01:58, Denys Dmytriyenko <denis@denix.org> wrote:
> From: "Franklin S. Cooper Jr" <fcooper@ti.com>
>
> * 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]

Queued in danny-next but probably won't make 1.3.1.

Thanks,
Ross

Patch

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"