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-03-01 15:38:47 +0000 |
| commit | 9abe92ec1c0cfbd285d0ca63cee5e0f35d0f35e1 (patch) | |
| tree | 6f95b2a0839e974a39a33b31e4f31317100ea25f | |
| parent | 98292d1ef1cb44cf96f0a28fbca6439eda55ce1b (diff) | |
| download | poky-9abe92ec1c0cfbd285d0ca63cee5e0f35d0f35e1.tar.gz poky-9abe92ec1c0cfbd285d0ca63cee5e0f35d0f35e1.tar.bz2 poky-9abe92ec1c0cfbd285d0ca63cee5e0f35d0f35e1.zip | |
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 <fcooper@ti.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 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" |