From 9abe92ec1c0cfbd285d0ca63cee5e0f35d0f35e1 Mon Sep 17 00:00:00 2001 From: "Franklin S. Cooper Jr" Date: Sat, 9 Feb 2013 11:08:10 -0600 Subject: 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] (From OE-Core rev: 00d0e1ac741e5fc01a40feb7dcc7ecd3906b5ce4) Signed-off-by: Franklin S. Cooper Jr Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- scripts/bitbake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bitbake b/scripts/bitbake index 79a81eaf0f..ca2bc82d04 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" -- cgit v1.2.3-54-g00ecf