Skip to contentSkip to conversation

scripts/bitbake: Remove all instances of paths to a layer's scripts directory.

PATCH Applied Denys Dmytriyenko 2 participants 2 messages Feb 16, 2013 – Feb 19, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scripts/bitbake: Remove all instances of paths to a layer's scripts directory.

From: "Franklin S. Cooper Jr" <[email protected]>

* 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]

---
 scripts/bitbake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/bitbake +1 -1
index 79a81ea..ca2bc82 100755
@@ -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"
Signature · 1 line
1.8.1.2
Applied
#1 lore raw
Quoted 5 lines · Denys Dmytriyenko

From: "Franklin S. Cooper Jr" <[email protected]>

* Currently the assumption is made that only oe-core can include a scripts directory.

Quoted 7 lines

* 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