From: Franklin S. Cooper Jr Date: Sat, 9 Feb 2013 17:08:10 +0000 (-0600) Subject: scripts/bitbake: Remove all instances of paths to a layer's scripts directory. X-Git-Tag: rev_ivi_2015_02_04~13670 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c29095997de4400c1da63ef21a6b8093aa7329b6;p=scm%2Fbb%2Ftizen-distro.git 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: 9b445cc39604223b0cfb21d28f748a86ff4cdf68) Signed-off-by: Franklin S. Cooper Jr Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- 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"