diff options
author | Franklin S. Cooper Jr <fcooper@ti.com> | 2013-02-09 11:08:10 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-15 12:17:35 +0000 |
commit | a9608dd3e5d32a784c13d2b379d36b9046226172 (patch) | |
tree | 3ec9b399f500df05eb7aaf330a4caf334c94e149 /scripts/bitbake | |
parent | a3ca3ecb93e34f9aa465e2d17c18fa68325f9e2b (diff) | |
download | poky-a9608dd3e5d32a784c13d2b379d36b9046226172.tar.gz |
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 <fcooper@ti.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/bitbake')
-rwxr-xr-x | scripts/bitbake | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
126 | fi | 126 | fi |
127 | 127 | ||
128 | OLDPATH=$PATH | 128 | OLDPATH=$PATH |
129 | export PATH=`echo $PATH | sed s#[^:]*/scripts:##` | 129 | export PATH=`echo $PATH | sed s#[^:]*/scripts:##g` |
130 | if [ $buildpseudo -gt 0 ]; then | 130 | if [ $buildpseudo -gt 0 ]; then |
131 | [ $buildpseudo -eq 1 ] && echo "Pseudo is not present but is required, building this first before the main build" | 131 | [ $buildpseudo -eq 1 ] && echo "Pseudo is not present but is required, building this first before the main build" |
132 | [ $buildpseudo -eq 2 ] && echo "Pseudo may be out of date, rebuilding pseudo before the main build" | 132 | [ $buildpseudo -eq 2 ] && echo "Pseudo may be out of date, rebuilding pseudo before the main build" |